From 97db170373c3fb1dcbe29268de31abf2da9ea7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 23 Feb 2016 13:55:12 -0300 Subject: uboot-am335x_bone: add package to [libre] --- .../0001-parabola-arm-modifications.patch | 43 ---- libre-testing/uboot-am335x_bone/PKGBUILD | 53 ----- libre-testing/uboot-am335x_bone/extlinux.conf | 46 ---- libre-testing/uboot-am335x_bone/uEnv.txt | 1 - .../uboot-am335x_bone/uboot-am335x_bone.install | 38 ---- .../0001-parabola-arm-modifications.patch | 43 ++++ libre/uboot-am335x_bone/PKGBUILD | 53 +++++ libre/uboot-am335x_bone/extlinux.conf | 46 ++++ libre/uboot-am335x_bone/uEnv.txt | 1 + libre/uboot-am335x_bone/uboot-am335x_bone.install | 38 ++++ .../0001-parabola-arm-modifications.patch | 238 --------------------- libre/uboot-beaglebone-linux-libre-grsec/PKGBUILD | 44 ---- libre/uboot-beaglebone-linux-libre-grsec/uEnv.txt | 1 - .../uboot-beaglebone-linux-libre-grsec.install | 32 --- .../0001-parabola-arm-modifications.patch | 238 --------------------- libre/uboot-beaglebone-linux-libre-lts/PKGBUILD | 44 ---- libre/uboot-beaglebone-linux-libre-lts/uEnv.txt | 1 - .../uboot-beaglebone-linux-libre-lts.install | 32 --- .../0001-parabola-arm-modifications.patch | 238 --------------------- libre/uboot-beaglebone-linux-libre-pck/PKGBUILD | 45 ---- libre/uboot-beaglebone-linux-libre-pck/uEnv.txt | 1 - .../uboot-beaglebone-linux-libre-pck.install | 32 --- .../0001-parabola-arm-modifications.patch | 238 --------------------- libre/uboot-beaglebone-linux-libre/PKGBUILD | 45 ---- libre/uboot-beaglebone-linux-libre/uEnv.txt | 1 - .../uboot-beaglebone-linux-libre.install | 32 --- 26 files changed, 181 insertions(+), 1443 deletions(-) delete mode 100644 libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch delete mode 100644 libre-testing/uboot-am335x_bone/PKGBUILD delete mode 100644 libre-testing/uboot-am335x_bone/extlinux.conf delete mode 100644 libre-testing/uboot-am335x_bone/uEnv.txt delete mode 100644 libre-testing/uboot-am335x_bone/uboot-am335x_bone.install create mode 100644 libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch create mode 100644 libre/uboot-am335x_bone/PKGBUILD create mode 100644 libre/uboot-am335x_bone/extlinux.conf create mode 100644 libre/uboot-am335x_bone/uEnv.txt create mode 100644 libre/uboot-am335x_bone/uboot-am335x_bone.install delete mode 100644 libre/uboot-beaglebone-linux-libre-grsec/0001-parabola-arm-modifications.patch delete mode 100644 libre/uboot-beaglebone-linux-libre-grsec/PKGBUILD delete mode 100644 libre/uboot-beaglebone-linux-libre-grsec/uEnv.txt delete mode 100644 libre/uboot-beaglebone-linux-libre-grsec/uboot-beaglebone-linux-libre-grsec.install delete mode 100644 libre/uboot-beaglebone-linux-libre-lts/0001-parabola-arm-modifications.patch delete mode 100644 libre/uboot-beaglebone-linux-libre-lts/PKGBUILD delete mode 100644 libre/uboot-beaglebone-linux-libre-lts/uEnv.txt delete mode 100644 libre/uboot-beaglebone-linux-libre-lts/uboot-beaglebone-linux-libre-lts.install delete mode 100644 libre/uboot-beaglebone-linux-libre-pck/0001-parabola-arm-modifications.patch delete mode 100644 libre/uboot-beaglebone-linux-libre-pck/PKGBUILD delete mode 100644 libre/uboot-beaglebone-linux-libre-pck/uEnv.txt delete mode 100644 libre/uboot-beaglebone-linux-libre-pck/uboot-beaglebone-linux-libre-pck.install delete mode 100644 libre/uboot-beaglebone-linux-libre/0001-parabola-arm-modifications.patch delete mode 100644 libre/uboot-beaglebone-linux-libre/PKGBUILD delete mode 100644 libre/uboot-beaglebone-linux-libre/uEnv.txt delete mode 100644 libre/uboot-beaglebone-linux-libre/uboot-beaglebone-linux-libre.install diff --git a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch deleted file mode 100644 index 2574a7929..000000000 --- a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 11:53:03.000000000 -0300 -+++ u-boot-2015.04/include/configs/am335x_evm.h 2016-02-22 21:45:18.256462447 -0300 -@@ -67,11 +67,18 @@ - - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - -+/* Enable extlinux boot support */ -+#define CONFIG_CMD_PXE -+#define CONFIG_MENU -+#define BOOT_TARGET_DEVICES(func) -+#include -+ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ -+ BOOTENV \ - DEFAULT_LINUX_BOOT_ENV \ - "boot_fdt=try\0" \ -- "bootpart=0:2\0" \ -+ "bootpart=0:1\0" \ - "bootdir=/boot\0" \ - "bootfile=zImage\0" \ - "fdtfile=undefined\0" \ -@@ -80,8 +87,10 @@ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ -+ "devtype=mmc\0" \ -+ "devnum=0\0" \ - "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -+ "mmcroot=/dev/mmcblk0p1 ro\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "rootpath=/export/rootfs\0" \ - "nfsopts=nolock\0" \ -@@ -149,6 +158,7 @@ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ -+ "usb start; run scan_dev_for_boot;" \ - "if run loadimage; then " \ - "run mmcloados;" \ - "fi;" \ diff --git a/libre-testing/uboot-am335x_bone/PKGBUILD b/libre-testing/uboot-am335x_bone/PKGBUILD deleted file mode 100644 index a62861a9f..000000000 --- a/libre-testing/uboot-am335x_bone/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# U-Boot: BeagleBone and BeagleBone Black -# Maintainer: André Silva -# Contributor: Jookia <166291@gmail.com> -# Contributor: Márcio Silva - -buildarch=4 - -pkgname=uboot-am335x_bone -pkgver=2015.04 -pkgrel=2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -replaces=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts' - 'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck' - 'uboot-beaglebone') -conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts' - 'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck' - 'uboot-beaglebone' 'uboot4grub-am335x_bone') -makedepends=('bc') -license=('GPL') -backup=(boot/extlinux/extlinux.conf) -install=${pkgname}.install -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-parabola-arm-modifications.patch' - 'extlinux.conf' - 'uEnv.txt') -md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - '7aaf785aa34682a174424f50988728e5' - 'cde2078db6208585d36d2f6a3c830860' - 'ccb79775b81654e16fca18825c7f2506') - -prepare() { - cd u-boot-${pkgver} - patch -Np1 -i ../0001-parabola-arm-modifications.patch -} - -build() { - cd u-boot-${pkgver} - - unset CFLAGS CXXFLAGS LDFLAGS - - make distclean - make am335x_evm_config - make -} - -package() { - cd u-boot-${pkgver} - mkdir -p "${pkgdir}"/boot/extlinux - cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot - cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux -} diff --git a/libre-testing/uboot-am335x_bone/extlinux.conf b/libre-testing/uboot-am335x_bone/extlinux.conf deleted file mode 100644 index 4d65ed61f..000000000 --- a/libre-testing/uboot-am335x_bone/extlinux.conf +++ /dev/null @@ -1,46 +0,0 @@ -menu title Welcome to Parabola! - -label Parabola GNU/Linux-libre w/ linux-libre kernel - kernel /boot/vmlinuz-linux-libre - append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 - fdtdir /boot/dtbs/linux-libre - -#label Parabola GNU/Linux-libre w/ linux-libre-lts kernel -# kernel /boot/vmlinuz-linux-libre-lts -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-lts - -#label Parabola GNU/Linux-libre w/ linux-libre-knock kernel -# kernel /boot/vmlinuz-linux-libre-knock -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-knock - -#label Parabola GNU/Linux-libre w/ linux-libre-lts-knock kernel -# kernel /boot/vmlinuz-linux-libre-lts-knock -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-lts-knock - -#label Parabola GNU/Linux-libre w/ linux-libre-grsec kernel -# kernel /boot/vmlinuz-linux-libre-grsec -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-grsec - -#label Parabola GNU/Linux-libre w/ linux-libre-grsec-knock kernel -# kernel /boot/vmlinuz-linux-libre-grsec-knock -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-grsec-knock - -#label Parabola GNU/Linux-libre w/ linux-libre-audit kernel -# kernel /boot/vmlinuz-linux-libre-audit -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-audit - -#label Parabola GNU/Linux-libre w/ linux-libre-pck kernel -# kernel /boot/vmlinuz-linux-libre-pck -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-pck - -#label Parabola GNU/Linux-libre w/ linux-libre-rt kernel -# kernel /boot/vmlinuz-linux-libre-rt -# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 -# fdtdir /boot/dtbs/linux-libre-rt diff --git a/libre-testing/uboot-am335x_bone/uEnv.txt b/libre-testing/uboot-am335x_bone/uEnv.txt deleted file mode 100644 index f432efc6b..000000000 --- a/libre-testing/uboot-am335x_bone/uEnv.txt +++ /dev/null @@ -1 +0,0 @@ -optargs=coherent_pool=1M diff --git a/libre-testing/uboot-am335x_bone/uboot-am335x_bone.install b/libre-testing/uboot-am335x_bone/uboot-am335x_bone.install deleted file mode 100644 index 0a71c804a..000000000 --- a/libre-testing/uboot-am335x_bone/uboot-am335x_bone.install +++ /dev/null @@ -1,38 +0,0 @@ -flash_instructions() { - 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" -} - -extlinux_warning() { - echo ">>> WARNING: for new entries, edit /boot/extlinux/extlinux.conf" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - 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 - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi -} - -post_install() { - flash_uboot - extlinux_warning -} - -post_upgrade() { - flash_uboot - extlinux_warning -} diff --git a/libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..2574a7929 --- /dev/null +++ b/libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch @@ -0,0 +1,43 @@ +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 11:53:03.000000000 -0300 ++++ u-boot-2015.04/include/configs/am335x_evm.h 2016-02-22 21:45:18.256462447 -0300 +@@ -67,11 +67,18 @@ + + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + ++/* Enable extlinux boot support */ ++#define CONFIG_CMD_PXE ++#define CONFIG_MENU ++#define BOOT_TARGET_DEVICES(func) ++#include ++ + #ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ ++ BOOTENV \ + DEFAULT_LINUX_BOOT_ENV \ + "boot_fdt=try\0" \ +- "bootpart=0:2\0" \ ++ "bootpart=0:1\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ + "fdtfile=undefined\0" \ +@@ -80,8 +87,10 @@ + "uuid_disk=${uuid_gpt_disk};" \ + "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ + "optargs=\0" \ ++ "devtype=mmc\0" \ ++ "devnum=0\0" \ + "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 ro\0" \ ++ "mmcroot=/dev/mmcblk0p1 ro\0" \ + "mmcrootfstype=ext4 rootwait\0" \ + "rootpath=/export/rootfs\0" \ + "nfsopts=nolock\0" \ +@@ -149,6 +158,7 @@ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ ++ "usb start; run scan_dev_for_boot;" \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ diff --git a/libre/uboot-am335x_bone/PKGBUILD b/libre/uboot-am335x_bone/PKGBUILD new file mode 100644 index 000000000..a62861a9f --- /dev/null +++ b/libre/uboot-am335x_bone/PKGBUILD @@ -0,0 +1,53 @@ +# U-Boot: BeagleBone and BeagleBone Black +# Maintainer: André Silva +# Contributor: Jookia <166291@gmail.com> +# Contributor: Márcio Silva + +buildarch=4 + +pkgname=uboot-am335x_bone +pkgver=2015.04 +pkgrel=2 +pkgdesc="U-Boot for BeagleBone and BeagleBone Black" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +replaces=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts' + 'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck' + 'uboot-beaglebone') +conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts' + 'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck' + 'uboot-beaglebone' 'uboot4grub-am335x_bone') +makedepends=('bc') +license=('GPL') +backup=(boot/extlinux/extlinux.conf) +install=${pkgname}.install +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + 'extlinux.conf' + 'uEnv.txt') +md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' + '7aaf785aa34682a174424f50988728e5' + 'cde2078db6208585d36d2f6a3c830860' + 'ccb79775b81654e16fca18825c7f2506') + +prepare() { + cd u-boot-${pkgver} + patch -Np1 -i ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset CFLAGS CXXFLAGS LDFLAGS + + make distclean + make am335x_evm_config + make +} + +package() { + cd u-boot-${pkgver} + mkdir -p "${pkgdir}"/boot/extlinux + cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot + cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux +} diff --git a/libre/uboot-am335x_bone/extlinux.conf b/libre/uboot-am335x_bone/extlinux.conf new file mode 100644 index 000000000..4d65ed61f --- /dev/null +++ b/libre/uboot-am335x_bone/extlinux.conf @@ -0,0 +1,46 @@ +menu title Welcome to Parabola! + +label Parabola GNU/Linux-libre w/ linux-libre kernel + kernel /boot/vmlinuz-linux-libre + append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 + fdtdir /boot/dtbs/linux-libre + +#label Parabola GNU/Linux-libre w/ linux-libre-lts kernel +# kernel /boot/vmlinuz-linux-libre-lts +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-lts + +#label Parabola GNU/Linux-libre w/ linux-libre-knock kernel +# kernel /boot/vmlinuz-linux-libre-knock +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-knock + +#label Parabola GNU/Linux-libre w/ linux-libre-lts-knock kernel +# kernel /boot/vmlinuz-linux-libre-lts-knock +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-lts-knock + +#label Parabola GNU/Linux-libre w/ linux-libre-grsec kernel +# kernel /boot/vmlinuz-linux-libre-grsec +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-grsec + +#label Parabola GNU/Linux-libre w/ linux-libre-grsec-knock kernel +# kernel /boot/vmlinuz-linux-libre-grsec-knock +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-grsec-knock + +#label Parabola GNU/Linux-libre w/ linux-libre-audit kernel +# kernel /boot/vmlinuz-linux-libre-audit +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-audit + +#label Parabola GNU/Linux-libre w/ linux-libre-pck kernel +# kernel /boot/vmlinuz-linux-libre-pck +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-pck + +#label Parabola GNU/Linux-libre w/ linux-libre-rt kernel +# kernel /boot/vmlinuz-linux-libre-rt +# append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8 +# fdtdir /boot/dtbs/linux-libre-rt diff --git a/libre/uboot-am335x_bone/uEnv.txt b/libre/uboot-am335x_bone/uEnv.txt new file mode 100644 index 000000000..f432efc6b --- /dev/null +++ b/libre/uboot-am335x_bone/uEnv.txt @@ -0,0 +1 @@ +optargs=coherent_pool=1M diff --git a/libre/uboot-am335x_bone/uboot-am335x_bone.install b/libre/uboot-am335x_bone/uboot-am335x_bone.install new file mode 100644 index 000000000..0a71c804a --- /dev/null +++ b/libre/uboot-am335x_bone/uboot-am335x_bone.install @@ -0,0 +1,38 @@ +flash_instructions() { + 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" +} + +extlinux_warning() { + echo ">>> WARNING: for new entries, edit /boot/extlinux/extlinux.conf" +} + +flash_uboot() { + root=$(mount | awk '/ on \/ / { print $1; }') + if [[ $root =~ ^/dev/mmcblk.*$ ]]; then + root=${root:0:12} + echo "A new U-Boot version needs to be flashed onto $root." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + 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 + else + echo "You can do this later by running:" + flash_instructions + fi + else + echo "Flash the new U-Boot version onto your boot device. For example:" + flash_instructions + fi +} + +post_install() { + flash_uboot + extlinux_warning +} + +post_upgrade() { + flash_uboot + extlinux_warning +} diff --git a/libre/uboot-beaglebone-linux-libre-grsec/0001-parabola-arm-modifications.patch b/libre/uboot-beaglebone-linux-libre-grsec/0001-parabola-arm-modifications.patch deleted file mode 100644 index ca64e8631..000000000 --- a/libre/uboot-beaglebone-linux-libre-grsec/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 968d041..3406926 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,7 +1,6 @@ - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_ADDR=0x82000000 --CONFIG_SYS_EXTRA_OPTIONS="NAND" --CONFIG_CONS_INDEX=1 -+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" - CONFIG_ARM=y - CONFIG_TARGET_AM335X_EVM=y -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index a87059c..e68e848 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -17,6 +17,7 @@ - #define __CONFIG_AM335X_EVM_H - - #include -+#define CONFIG_ENV_IS_NOWHERE - - #ifndef CONFIG_SPL_BUILD - #ifndef CONFIG_FIT -@@ -45,6 +46,9 @@ - /* Enhance our eMMC support / experience. */ - #define CONFIG_CMD_GPT - #define CONFIG_EFI_PARTITION -+#define CONFIG_CMD_PART -+#define CONFIG_PARTITION_UUIDS -+#define CONFIG_CMD_SETEXPR - - #ifdef CONFIG_NAND - #define NANDARGS \ -@@ -70,110 +74,79 @@ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ -- "boot_fdt=try\0" \ -- "bootpart=0:2\0" \ -+ "bootpart=0:1\0" \ - "bootdir=/boot\0" \ -- "bootfile=zImage\0" \ -+ "fdtdir=/boot/dtbs/linux-libre-grsec\0" \ -+ "bootfile=vmlinuz-linux-libre-grsec\0" \ - "fdtfile=undefined\0" \ -+ "rdfile=initramfs-linux-libre-grsec.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ -- "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -- "mmcrootfstype=ext4 rootwait\0" \ -- "rootpath=/export/rootfs\0" \ -- "nfsopts=nolock\0" \ -- "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ -- "::off\0" \ -- "ramroot=/dev/ram0 rw\0" \ -- "ramrootfstype=ext2\0" \ -+ "cape_disable=\0" \ -+ "cape_enable=\0" \ -+ "cmdline=\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -- "spiroot=/dev/mtdblock4 rw\0" \ -- "spirootfstype=jffs2\0" \ -- "spisrcaddr=0xe0000\0" \ -- "spiimgsize=0x362000\0" \ -- "spibusno=0\0" \ -- "spiargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${spiroot} " \ -- "rootfstype=${spirootfstype}\0" \ -- "netargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=/dev/nfs " \ -- "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ -- "ip=dhcp\0" \ -- "bootenv=uEnv.txt\0" \ -- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ -- "source ${loadaddr}\0" \ -- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ -- "importbootenv=echo Importing environment from mmc ...; " \ -- "env import -t -r $loadaddr $filesize\0" \ -- "ramargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${ramroot} " \ -- "rootfstype=${ramrootfstype}\0" \ -- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ -- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -- "mmcloados=run mmcargs; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if run loadfdt; then " \ -- "bootz ${loadaddr} - ${fdtaddr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootz; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootz; " \ -- "fi;\0" \ -- "mmcboot=mmc dev ${mmcdev}; " \ -- "if mmc rescan; then " \ -- "echo SD/MMC found on device ${mmcdev};" \ -- "if run loadbootscript; then " \ -- "run bootscript;" \ -- "else " \ -- "if run loadbootenv; then " \ -- "echo Loaded environment from ${bootenv};" \ -- "run importbootenv;" \ -+ "${cape_disable} " \ -+ "${cape_enable} " \ -+ "root=${root} " \ -+ "${cmdline}\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 " \ -+ "if ${devtype} dev ${devnum}; then " \ -+ "echo ${devtype} found on device ${devnum};" \ -+ "setenv bootpart ${devnum}:1;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \ -+ "echo Checking for: ${bootdir}/uboot-beaglebone-linux-libre-grsec/uEnv.txt ...;" \ -+ "gpio set 54;" \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/uboot-beaglebone-linux-libre-grsec/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uboot-beaglebone-linux-libre-grsec/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from ${bootdir}/uboot-beaglebone-linux-libre-grsec/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 ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi;" \ -+ "gpio set 55;" \ -+ "if run loadimage; then " \ -+ "run mmcargs;" \ -+ "if run loadfdt; then " \ -+ "gpio set 56;" \ -+ "if run loadrd; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "fi;" \ -+ "else " \ -+ "echo No kernel found;" \ -+ "fi;" \ -+ "gpio clear 54; gpio clear 55;" \ -+ "setexpr devnum ${devnum} + 1;" \ - "fi;" \ -- "if test -n $uenvcmd; then " \ -- "echo Running uenvcmd ...;" \ -- "run uenvcmd;" \ -- "fi;" \ -- "if run loadimage; then " \ -- "run mmcloados;" \ -- "fi;" \ -- "fi ;" \ -- "fi;\0" \ -- "spiboot=echo Booting from spi ...; " \ -- "run spiargs; " \ -- "sf probe ${spibusno}:0; " \ -- "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ -- "bootz ${loadaddr}\0" \ -- "netboot=echo Booting from network ...; " \ -- "setenv autoload no; " \ -- "dhcp; " \ -- "tftp ${loadaddr} ${bootfile}; " \ -- "tftp ${fdtaddr} ${fdtfile}; " \ -- "run netargs; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" \ -- "ramboot=echo Booting from ramdisk ...; " \ -- "run ramargs; " \ -- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ -+ "done;" \ -+ "done;\0" \ - "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 +158,11 @@ - #endif - - #define CONFIG_BOOTCOMMAND \ -- "run findfdt; " \ -- "run mmcboot;" \ -- "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" - - /* NS16550 Configuration */ - #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -@@ -329,9 +301,8 @@ - #endif - - #ifdef CONFIG_MUSB_GADGET --#define CONFIG_USB_ETHER --#define CONFIG_USB_ETH_RNDIS --#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -+#define CONFIG_CMD_USB_MASS_STORAGE -+#define CONFIG_USB_GADGET_MASS_STORAGE - - /* USB TI's IDs */ - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 --- -2.4.2 - diff --git a/libre/uboot-beaglebone-linux-libre-grsec/PKGBUILD b/libre/uboot-beaglebone-linux-libre-grsec/PKGBUILD deleted file mode 100644 index 39a57b143..000000000 --- a/libre/uboot-beaglebone-linux-libre-grsec/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# U-Boot: BeagleBone and BeagleBone Black -# Maintainer (Arch): Kevin Mihelich -# Contributor: André Silva - -buildarch=4 - -_pkgname=linux-libre-grsec -pkgname=uboot-beaglebone-${_pkgname} -pkgver=2015.04 -pkgrel=1.2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black (built for the linux-libre-grsec kernel package)" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -depends=('linux-libre-grsec') -makedepends=('bc') -license=('GPL') -install=${pkgname}.install -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-parabola-arm-modifications.patch' - 'uEnv.txt') -md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - 'e8d6cc3bdc37c135084becc446053dec' - 'ccb79775b81654e16fca18825c7f2506') - -prepare() { - cd u-boot-${pkgver} - patch -Np1 -i ../0001-parabola-arm-modifications.patch -} - -build() { - cd u-boot-${pkgver} - - unset CFLAGS CXXFLAGS LDFLAGS - - make distclean - make am335x_evm_config - make -} - -package() { - cd u-boot-${pkgver} - mkdir -p "${pkgdir}/boot/${pkgname}" - cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}/boot/${pkgname}" -} diff --git a/libre/uboot-beaglebone-linux-libre-grsec/uEnv.txt b/libre/uboot-beaglebone-linux-libre-grsec/uEnv.txt deleted file mode 100644 index f432efc6b..000000000 --- a/libre/uboot-beaglebone-linux-libre-grsec/uEnv.txt +++ /dev/null @@ -1 +0,0 @@ -optargs=coherent_pool=1M diff --git a/libre/uboot-beaglebone-linux-libre-grsec/uboot-beaglebone-linux-libre-grsec.install b/libre/uboot-beaglebone-linux-libre-grsec/uboot-beaglebone-linux-libre-grsec.install deleted file mode 100644 index 54f2754d8..000000000 --- a/libre/uboot-beaglebone-linux-libre-grsec/uboot-beaglebone-linux-libre-grsec.install +++ /dev/null @@ -1,32 +0,0 @@ -flash_instructions() { - echo "# dd if=/boot/uboot-beaglebone-linux-libre-grsec/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/uboot-beaglebone-linux-libre-grsec/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/uboot-beaglebone-linux-libre-grsec/MLO of=$root count=1 seek=1 conv=notrunc bs=128k - dd if=/boot/uboot-beaglebone-linux-libre-grsec/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi -} - -post_install() { - flash_uboot -} - -post_upgrade() { - flash_uboot -} diff --git a/libre/uboot-beaglebone-linux-libre-lts/0001-parabola-arm-modifications.patch b/libre/uboot-beaglebone-linux-libre-lts/0001-parabola-arm-modifications.patch deleted file mode 100644 index 86c54aae7..000000000 --- a/libre/uboot-beaglebone-linux-libre-lts/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 968d041..3406926 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,7 +1,6 @@ - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_ADDR=0x82000000 --CONFIG_SYS_EXTRA_OPTIONS="NAND" --CONFIG_CONS_INDEX=1 -+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" - CONFIG_ARM=y - CONFIG_TARGET_AM335X_EVM=y -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index a87059c..e68e848 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -17,6 +17,7 @@ - #define __CONFIG_AM335X_EVM_H - - #include -+#define CONFIG_ENV_IS_NOWHERE - - #ifndef CONFIG_SPL_BUILD - #ifndef CONFIG_FIT -@@ -45,6 +46,9 @@ - /* Enhance our eMMC support / experience. */ - #define CONFIG_CMD_GPT - #define CONFIG_EFI_PARTITION -+#define CONFIG_CMD_PART -+#define CONFIG_PARTITION_UUIDS -+#define CONFIG_CMD_SETEXPR - - #ifdef CONFIG_NAND - #define NANDARGS \ -@@ -70,110 +74,79 @@ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ -- "boot_fdt=try\0" \ -- "bootpart=0:2\0" \ -+ "bootpart=0:1\0" \ - "bootdir=/boot\0" \ -- "bootfile=zImage\0" \ -+ "fdtdir=/boot/dtbs/linux-libre-lts\0" \ -+ "bootfile=vmlinuz-linux-libre-lts\0" \ - "fdtfile=undefined\0" \ -+ "rdfile=initramfs-linux-libre-lts.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ -- "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -- "mmcrootfstype=ext4 rootwait\0" \ -- "rootpath=/export/rootfs\0" \ -- "nfsopts=nolock\0" \ -- "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ -- "::off\0" \ -- "ramroot=/dev/ram0 rw\0" \ -- "ramrootfstype=ext2\0" \ -+ "cape_disable=\0" \ -+ "cape_enable=\0" \ -+ "cmdline=\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -- "spiroot=/dev/mtdblock4 rw\0" \ -- "spirootfstype=jffs2\0" \ -- "spisrcaddr=0xe0000\0" \ -- "spiimgsize=0x362000\0" \ -- "spibusno=0\0" \ -- "spiargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${spiroot} " \ -- "rootfstype=${spirootfstype}\0" \ -- "netargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=/dev/nfs " \ -- "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ -- "ip=dhcp\0" \ -- "bootenv=uEnv.txt\0" \ -- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ -- "source ${loadaddr}\0" \ -- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ -- "importbootenv=echo Importing environment from mmc ...; " \ -- "env import -t -r $loadaddr $filesize\0" \ -- "ramargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${ramroot} " \ -- "rootfstype=${ramrootfstype}\0" \ -- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ -- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -- "mmcloados=run mmcargs; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if run loadfdt; then " \ -- "bootz ${loadaddr} - ${fdtaddr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootz; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootz; " \ -- "fi;\0" \ -- "mmcboot=mmc dev ${mmcdev}; " \ -- "if mmc rescan; then " \ -- "echo SD/MMC found on device ${mmcdev};" \ -- "if run loadbootscript; then " \ -- "run bootscript;" \ -- "else " \ -- "if run loadbootenv; then " \ -- "echo Loaded environment from ${bootenv};" \ -- "run importbootenv;" \ -+ "${cape_disable} " \ -+ "${cape_enable} " \ -+ "root=${root} " \ -+ "${cmdline}\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 " \ -+ "if ${devtype} dev ${devnum}; then " \ -+ "echo ${devtype} found on device ${devnum};" \ -+ "setenv bootpart ${devnum}:1;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \ -+ "echo Checking for: ${bootdir}/uboot-beaglebone-linux-libre-lts/uEnv.txt ...;" \ -+ "gpio set 54;" \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/uboot-beaglebone-linux-libre-lts/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uboot-beaglebone-linux-libre-lts/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from ${bootdir}/uboot-beaglebone-linux-libre-lts/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 ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi;" \ -+ "gpio set 55;" \ -+ "if run loadimage; then " \ -+ "run mmcargs;" \ -+ "if run loadfdt; then " \ -+ "gpio set 56;" \ -+ "if run loadrd; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "fi;" \ -+ "else " \ -+ "echo No kernel found;" \ -+ "fi;" \ -+ "gpio clear 54; gpio clear 55;" \ -+ "setexpr devnum ${devnum} + 1;" \ - "fi;" \ -- "if test -n $uenvcmd; then " \ -- "echo Running uenvcmd ...;" \ -- "run uenvcmd;" \ -- "fi;" \ -- "if run loadimage; then " \ -- "run mmcloados;" \ -- "fi;" \ -- "fi ;" \ -- "fi;\0" \ -- "spiboot=echo Booting from spi ...; " \ -- "run spiargs; " \ -- "sf probe ${spibusno}:0; " \ -- "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ -- "bootz ${loadaddr}\0" \ -- "netboot=echo Booting from network ...; " \ -- "setenv autoload no; " \ -- "dhcp; " \ -- "tftp ${loadaddr} ${bootfile}; " \ -- "tftp ${fdtaddr} ${fdtfile}; " \ -- "run netargs; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" \ -- "ramboot=echo Booting from ramdisk ...; " \ -- "run ramargs; " \ -- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ -+ "done;" \ -+ "done;\0" \ - "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 +158,11 @@ - #endif - - #define CONFIG_BOOTCOMMAND \ -- "run findfdt; " \ -- "run mmcboot;" \ -- "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" - - /* NS16550 Configuration */ - #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -@@ -329,9 +301,8 @@ - #endif - - #ifdef CONFIG_MUSB_GADGET --#define CONFIG_USB_ETHER --#define CONFIG_USB_ETH_RNDIS --#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -+#define CONFIG_CMD_USB_MASS_STORAGE -+#define CONFIG_USB_GADGET_MASS_STORAGE - - /* USB TI's IDs */ - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 --- -2.4.2 - diff --git a/libre/uboot-beaglebone-linux-libre-lts/PKGBUILD b/libre/uboot-beaglebone-linux-libre-lts/PKGBUILD deleted file mode 100644 index 7169c10db..000000000 --- a/libre/uboot-beaglebone-linux-libre-lts/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# U-Boot: BeagleBone and BeagleBone Black -# Maintainer (Arch): Kevin Mihelich -# Contributor: André Silva - -buildarch=4 - -_pkgname=linux-libre-lts -pkgname=uboot-beaglebone-${_pkgname} -pkgver=2015.04 -pkgrel=1.2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black (built for the linux-libre-lts kernel package)" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -depends=('linux-libre-lts') -makedepends=('bc') -license=('GPL') -install=${pkgname}.install -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-parabola-arm-modifications.patch' - 'uEnv.txt') -md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - '712ff9754c5706ee8a32e52ea909dc64' - 'ccb79775b81654e16fca18825c7f2506') - -prepare() { - cd u-boot-${pkgver} - patch -Np1 -i ../0001-parabola-arm-modifications.patch -} - -build() { - cd u-boot-${pkgver} - - unset CFLAGS CXXFLAGS LDFLAGS - - make distclean - make am335x_evm_config - make -} - -package() { - cd u-boot-${pkgver} - mkdir -p "${pkgdir}/boot/${pkgname}" - cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}/boot/${pkgname}" -} diff --git a/libre/uboot-beaglebone-linux-libre-lts/uEnv.txt b/libre/uboot-beaglebone-linux-libre-lts/uEnv.txt deleted file mode 100644 index f432efc6b..000000000 --- a/libre/uboot-beaglebone-linux-libre-lts/uEnv.txt +++ /dev/null @@ -1 +0,0 @@ -optargs=coherent_pool=1M diff --git a/libre/uboot-beaglebone-linux-libre-lts/uboot-beaglebone-linux-libre-lts.install b/libre/uboot-beaglebone-linux-libre-lts/uboot-beaglebone-linux-libre-lts.install deleted file mode 100644 index d9eef2a9d..000000000 --- a/libre/uboot-beaglebone-linux-libre-lts/uboot-beaglebone-linux-libre-lts.install +++ /dev/null @@ -1,32 +0,0 @@ -flash_instructions() { - echo "# dd if=/boot/uboot-beaglebone-linux-libre-lts/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/uboot-beaglebone-linux-libre-lts/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/uboot-beaglebone-linux-libre-lts/MLO of=$root count=1 seek=1 conv=notrunc bs=128k - dd if=/boot/uboot-beaglebone-linux-libre-lts/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi -} - -post_install() { - flash_uboot -} - -post_upgrade() { - flash_uboot -} diff --git a/libre/uboot-beaglebone-linux-libre-pck/0001-parabola-arm-modifications.patch b/libre/uboot-beaglebone-linux-libre-pck/0001-parabola-arm-modifications.patch deleted file mode 100644 index b4fb1f5cc..000000000 --- a/libre/uboot-beaglebone-linux-libre-pck/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 968d041..3406926 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,7 +1,6 @@ - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_ADDR=0x82000000 --CONFIG_SYS_EXTRA_OPTIONS="NAND" --CONFIG_CONS_INDEX=1 -+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" - CONFIG_ARM=y - CONFIG_TARGET_AM335X_EVM=y -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index a87059c..e68e848 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -17,6 +17,7 @@ - #define __CONFIG_AM335X_EVM_H - - #include -+#define CONFIG_ENV_IS_NOWHERE - - #ifndef CONFIG_SPL_BUILD - #ifndef CONFIG_FIT -@@ -45,6 +46,9 @@ - /* Enhance our eMMC support / experience. */ - #define CONFIG_CMD_GPT - #define CONFIG_EFI_PARTITION -+#define CONFIG_CMD_PART -+#define CONFIG_PARTITION_UUIDS -+#define CONFIG_CMD_SETEXPR - - #ifdef CONFIG_NAND - #define NANDARGS \ -@@ -70,110 +74,79 @@ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ -- "boot_fdt=try\0" \ -- "bootpart=0:2\0" \ -+ "bootpart=0:1\0" \ - "bootdir=/boot\0" \ -- "bootfile=zImage\0" \ -+ "fdtdir=/boot/dtbs/linux-libre-pck\0" \ -+ "bootfile=vmlinuz-linux-libre-pck\0" \ - "fdtfile=undefined\0" \ -+ "rdfile=initramfs-linux-libre-pck.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ -- "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -- "mmcrootfstype=ext4 rootwait\0" \ -- "rootpath=/export/rootfs\0" \ -- "nfsopts=nolock\0" \ -- "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ -- "::off\0" \ -- "ramroot=/dev/ram0 rw\0" \ -- "ramrootfstype=ext2\0" \ -+ "cape_disable=\0" \ -+ "cape_enable=\0" \ -+ "cmdline=\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -- "spiroot=/dev/mtdblock4 rw\0" \ -- "spirootfstype=jffs2\0" \ -- "spisrcaddr=0xe0000\0" \ -- "spiimgsize=0x362000\0" \ -- "spibusno=0\0" \ -- "spiargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${spiroot} " \ -- "rootfstype=${spirootfstype}\0" \ -- "netargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=/dev/nfs " \ -- "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ -- "ip=dhcp\0" \ -- "bootenv=uEnv.txt\0" \ -- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ -- "source ${loadaddr}\0" \ -- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ -- "importbootenv=echo Importing environment from mmc ...; " \ -- "env import -t -r $loadaddr $filesize\0" \ -- "ramargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${ramroot} " \ -- "rootfstype=${ramrootfstype}\0" \ -- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ -- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -- "mmcloados=run mmcargs; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if run loadfdt; then " \ -- "bootz ${loadaddr} - ${fdtaddr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootz; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootz; " \ -- "fi;\0" \ -- "mmcboot=mmc dev ${mmcdev}; " \ -- "if mmc rescan; then " \ -- "echo SD/MMC found on device ${mmcdev};" \ -- "if run loadbootscript; then " \ -- "run bootscript;" \ -- "else " \ -- "if run loadbootenv; then " \ -- "echo Loaded environment from ${bootenv};" \ -- "run importbootenv;" \ -+ "${cape_disable} " \ -+ "${cape_enable} " \ -+ "root=${root} " \ -+ "${cmdline}\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 " \ -+ "if ${devtype} dev ${devnum}; then " \ -+ "echo ${devtype} found on device ${devnum};" \ -+ "setenv bootpart ${devnum}:1;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \ -+ "echo Checking for: ${bootdir}/uboot-beaglebone-linux-libre-pck/uEnv.txt ...;" \ -+ "gpio set 54;" \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/uboot-beaglebone-linux-libre-pck/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uboot-beaglebone-linux-libre-pck/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from ${bootdir}/uboot-beaglebone-linux-libre-pck/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 ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi;" \ -+ "gpio set 55;" \ -+ "if run loadimage; then " \ -+ "run mmcargs;" \ -+ "if run loadfdt; then " \ -+ "gpio set 56;" \ -+ "if run loadrd; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "fi;" \ -+ "else " \ -+ "echo No kernel found;" \ -+ "fi;" \ -+ "gpio clear 54; gpio clear 55;" \ -+ "setexpr devnum ${devnum} + 1;" \ - "fi;" \ -- "if test -n $uenvcmd; then " \ -- "echo Running uenvcmd ...;" \ -- "run uenvcmd;" \ -- "fi;" \ -- "if run loadimage; then " \ -- "run mmcloados;" \ -- "fi;" \ -- "fi ;" \ -- "fi;\0" \ -- "spiboot=echo Booting from spi ...; " \ -- "run spiargs; " \ -- "sf probe ${spibusno}:0; " \ -- "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ -- "bootz ${loadaddr}\0" \ -- "netboot=echo Booting from network ...; " \ -- "setenv autoload no; " \ -- "dhcp; " \ -- "tftp ${loadaddr} ${bootfile}; " \ -- "tftp ${fdtaddr} ${fdtfile}; " \ -- "run netargs; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" \ -- "ramboot=echo Booting from ramdisk ...; " \ -- "run ramargs; " \ -- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ -+ "done;" \ -+ "done;\0" \ - "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 +158,11 @@ - #endif - - #define CONFIG_BOOTCOMMAND \ -- "run findfdt; " \ -- "run mmcboot;" \ -- "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" - - /* NS16550 Configuration */ - #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -@@ -329,9 +301,8 @@ - #endif - - #ifdef CONFIG_MUSB_GADGET --#define CONFIG_USB_ETHER --#define CONFIG_USB_ETH_RNDIS --#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -+#define CONFIG_CMD_USB_MASS_STORAGE -+#define CONFIG_USB_GADGET_MASS_STORAGE - - /* USB TI's IDs */ - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 --- -2.4.2 - diff --git a/libre/uboot-beaglebone-linux-libre-pck/PKGBUILD b/libre/uboot-beaglebone-linux-libre-pck/PKGBUILD deleted file mode 100644 index e8c2c7e5d..000000000 --- a/libre/uboot-beaglebone-linux-libre-pck/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# U-Boot: BeagleBone and BeagleBone Black -# Maintainer (Arch): Kevin Mihelich -# Contributor: André Silva -# Contributor: Isaac David - -buildarch=4 - -_pkgname=linux-libre-pck -pkgname=uboot-beaglebone-${_pkgname} -pkgver=2015.04 -pkgrel=1.2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black (built for the linux-libre-pck kernel package)" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -depends=('linux-libre-pck') -makedepends=('bc') -license=('GPL') -install=${pkgname}.install -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-parabola-arm-modifications.patch' - 'uEnv.txt') -md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - '69e0f4a88119749a5c263cdedcece25f' - 'ccb79775b81654e16fca18825c7f2506') - -prepare() { - cd u-boot-${pkgver} - patch -Np1 -i ../0001-parabola-arm-modifications.patch -} - -build() { - cd u-boot-${pkgver} - - unset CFLAGS CXXFLAGS LDFLAGS - - make distclean - make am335x_evm_config - make -} - -package() { - cd u-boot-${pkgver} - mkdir -p "${pkgdir}/boot/${pkgname}" - cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}/boot/${pkgname}" -} diff --git a/libre/uboot-beaglebone-linux-libre-pck/uEnv.txt b/libre/uboot-beaglebone-linux-libre-pck/uEnv.txt deleted file mode 100644 index f432efc6b..000000000 --- a/libre/uboot-beaglebone-linux-libre-pck/uEnv.txt +++ /dev/null @@ -1 +0,0 @@ -optargs=coherent_pool=1M diff --git a/libre/uboot-beaglebone-linux-libre-pck/uboot-beaglebone-linux-libre-pck.install b/libre/uboot-beaglebone-linux-libre-pck/uboot-beaglebone-linux-libre-pck.install deleted file mode 100644 index 3ad25cc13..000000000 --- a/libre/uboot-beaglebone-linux-libre-pck/uboot-beaglebone-linux-libre-pck.install +++ /dev/null @@ -1,32 +0,0 @@ -flash_instructions() { - echo "# dd if=/boot/uboot-beaglebone-linux-libre-pck/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/uboot-beaglebone-linux-libre-pck/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/uboot-beaglebone-linux-libre-pck/MLO of=$root count=1 seek=1 conv=notrunc bs=128k - dd if=/boot/uboot-beaglebone-linux-libre-pck/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi -} - -post_install() { - flash_uboot -} - -post_upgrade() { - flash_uboot -} diff --git a/libre/uboot-beaglebone-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-beaglebone-linux-libre/0001-parabola-arm-modifications.patch deleted file mode 100644 index f9c41357d..000000000 --- a/libre/uboot-beaglebone-linux-libre/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,238 +0,0 @@ -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 968d041..3406926 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,7 +1,6 @@ - CONFIG_SPL=y - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_ADDR=0x82000000 --CONFIG_SYS_EXTRA_OPTIONS="NAND" --CONFIG_CONS_INDEX=1 -+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" - CONFIG_ARM=y - CONFIG_TARGET_AM335X_EVM=y -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index a87059c..e68e848 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -17,6 +17,7 @@ - #define __CONFIG_AM335X_EVM_H - - #include -+#define CONFIG_ENV_IS_NOWHERE - - #ifndef CONFIG_SPL_BUILD - #ifndef CONFIG_FIT -@@ -45,6 +46,9 @@ - /* Enhance our eMMC support / experience. */ - #define CONFIG_CMD_GPT - #define CONFIG_EFI_PARTITION -+#define CONFIG_CMD_PART -+#define CONFIG_PARTITION_UUIDS -+#define CONFIG_CMD_SETEXPR - - #ifdef CONFIG_NAND - #define NANDARGS \ -@@ -70,110 +74,79 @@ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ -- "boot_fdt=try\0" \ -- "bootpart=0:2\0" \ -+ "bootpart=0:1\0" \ - "bootdir=/boot\0" \ -- "bootfile=zImage\0" \ -+ "fdtdir=/boot/dtbs/linux-libre\0" \ -+ "bootfile=vmlinuz-linux-libre\0" \ - "fdtfile=undefined\0" \ -+ "rdfile=initramfs-linux-libre.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ -- "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -- "mmcrootfstype=ext4 rootwait\0" \ -- "rootpath=/export/rootfs\0" \ -- "nfsopts=nolock\0" \ -- "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ -- "::off\0" \ -- "ramroot=/dev/ram0 rw\0" \ -- "ramrootfstype=ext2\0" \ -+ "cape_disable=\0" \ -+ "cape_enable=\0" \ -+ "cmdline=\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -- "spiroot=/dev/mtdblock4 rw\0" \ -- "spirootfstype=jffs2\0" \ -- "spisrcaddr=0xe0000\0" \ -- "spiimgsize=0x362000\0" \ -- "spibusno=0\0" \ -- "spiargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${spiroot} " \ -- "rootfstype=${spirootfstype}\0" \ -- "netargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=/dev/nfs " \ -- "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ -- "ip=dhcp\0" \ -- "bootenv=uEnv.txt\0" \ -- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ -- "source ${loadaddr}\0" \ -- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ -- "importbootenv=echo Importing environment from mmc ...; " \ -- "env import -t -r $loadaddr $filesize\0" \ -- "ramargs=setenv bootargs console=${console} " \ -- "${optargs} " \ -- "root=${ramroot} " \ -- "rootfstype=${ramrootfstype}\0" \ -- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ -- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -- "mmcloados=run mmcargs; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if run loadfdt; then " \ -- "bootz ${loadaddr} - ${fdtaddr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootz; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootz; " \ -- "fi;\0" \ -- "mmcboot=mmc dev ${mmcdev}; " \ -- "if mmc rescan; then " \ -- "echo SD/MMC found on device ${mmcdev};" \ -- "if run loadbootscript; then " \ -- "run bootscript;" \ -- "else " \ -- "if run loadbootenv; then " \ -- "echo Loaded environment from ${bootenv};" \ -- "run importbootenv;" \ -+ "${cape_disable} " \ -+ "${cape_enable} " \ -+ "root=${root} " \ -+ "${cmdline}\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 " \ -+ "if ${devtype} dev ${devnum}; then " \ -+ "echo ${devtype} found on device ${devnum};" \ -+ "setenv bootpart ${devnum}:1;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \ -+ "echo Checking for: ${bootdir}/uboot-beaglebone-linux-libre/uEnv.txt ...;" \ -+ "gpio set 54;" \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/uboot-beaglebone-linux-libre/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uboot-beaglebone-linux-libre/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from ${bootdir}/uboot-beaglebone-linux-libre/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 ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi;" \ -+ "gpio set 55;" \ -+ "if run loadimage; then " \ -+ "run mmcargs;" \ -+ "if run loadfdt; then " \ -+ "gpio set 56;" \ -+ "if run loadrd; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "fi;" \ -+ "else " \ -+ "echo No kernel found;" \ -+ "fi;" \ -+ "gpio clear 54; gpio clear 55;" \ -+ "setexpr devnum ${devnum} + 1;" \ - "fi;" \ -- "if test -n $uenvcmd; then " \ -- "echo Running uenvcmd ...;" \ -- "run uenvcmd;" \ -- "fi;" \ -- "if run loadimage; then " \ -- "run mmcloados;" \ -- "fi;" \ -- "fi ;" \ -- "fi;\0" \ -- "spiboot=echo Booting from spi ...; " \ -- "run spiargs; " \ -- "sf probe ${spibusno}:0; " \ -- "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ -- "bootz ${loadaddr}\0" \ -- "netboot=echo Booting from network ...; " \ -- "setenv autoload no; " \ -- "dhcp; " \ -- "tftp ${loadaddr} ${bootfile}; " \ -- "tftp ${fdtaddr} ${fdtfile}; " \ -- "run netargs; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" \ -- "ramboot=echo Booting from ramdisk ...; " \ -- "run ramargs; " \ -- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ -+ "done;" \ -+ "done;\0" \ - "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 +158,11 @@ - #endif - - #define CONFIG_BOOTCOMMAND \ -- "run findfdt; " \ -- "run mmcboot;" \ -- "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" - - /* NS16550 Configuration */ - #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -@@ -329,9 +301,8 @@ - #endif - - #ifdef CONFIG_MUSB_GADGET --#define CONFIG_USB_ETHER --#define CONFIG_USB_ETH_RNDIS --#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -+#define CONFIG_CMD_USB_MASS_STORAGE -+#define CONFIG_USB_GADGET_MASS_STORAGE - - /* USB TI's IDs */ - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 --- -2.4.2 - diff --git a/libre/uboot-beaglebone-linux-libre/PKGBUILD b/libre/uboot-beaglebone-linux-libre/PKGBUILD deleted file mode 100644 index c71091303..000000000 --- a/libre/uboot-beaglebone-linux-libre/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# U-Boot: BeagleBone and BeagleBone Black -# Maintainer (Arch): Kevin Mihelich -# Contributor: André Silva - -buildarch=4 - -_pkgname=linux-libre -pkgname=uboot-beaglebone-${_pkgname} -pkgver=2015.04 -pkgrel=1.2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black (built for the linux-libre kernel package)" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -depends=('linux-libre') -makedepends=('bc') -replaces=('uboot-beaglebone') -license=('GPL') -install=${pkgname}.install -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-parabola-arm-modifications.patch' - 'uEnv.txt') -md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - '866dc9001d2d0d3e6b3d3b3c7ffced53' - 'ccb79775b81654e16fca18825c7f2506') - -prepare() { - cd u-boot-${pkgver} - patch -Np1 -i ../0001-parabola-arm-modifications.patch -} - -build() { - cd u-boot-${pkgver} - - unset CFLAGS CXXFLAGS LDFLAGS - - make distclean - make am335x_evm_config - make -} - -package() { - cd u-boot-${pkgver} - mkdir -p "${pkgdir}/boot/${pkgname}" - cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}/boot/${pkgname}" -} diff --git a/libre/uboot-beaglebone-linux-libre/uEnv.txt b/libre/uboot-beaglebone-linux-libre/uEnv.txt deleted file mode 100644 index f432efc6b..000000000 --- a/libre/uboot-beaglebone-linux-libre/uEnv.txt +++ /dev/null @@ -1 +0,0 @@ -optargs=coherent_pool=1M diff --git a/libre/uboot-beaglebone-linux-libre/uboot-beaglebone-linux-libre.install b/libre/uboot-beaglebone-linux-libre/uboot-beaglebone-linux-libre.install deleted file mode 100644 index f9ebe141e..000000000 --- a/libre/uboot-beaglebone-linux-libre/uboot-beaglebone-linux-libre.install +++ /dev/null @@ -1,32 +0,0 @@ -flash_instructions() { - echo "# dd if=/boot/uboot-beaglebone-linux-libre/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/uboot-beaglebone-linux-libre/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/uboot-beaglebone-linux-libre/MLO of=$root count=1 seek=1 conv=notrunc bs=128k - dd if=/boot/uboot-beaglebone-linux-libre/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi -} - -post_install() { - flash_uboot -} - -post_upgrade() { - flash_uboot -} -- cgit v1.1-4-g5e80