summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-03-05 13:53:36 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-03-08 17:21:50 +0100
commitf35b39d0db1287cc76471ccd6076a30487f0c6a5 (patch)
treebffd1f824576c24dfffd783bbb0168baf91cb8ed
parentc4b6ded9035eee13c403c831940496bf9062669b (diff)
downloadabslibre-f35b39d0db1287cc76471ccd6076a30487f0c6a5.tar.gz
abslibre-f35b39d0db1287cc76471ccd6076a30487f0c6a5.tar.bz2
abslibre-f35b39d0db1287cc76471ccd6076a30487f0c6a5.zip
libre: uboot4extlinux-am335x: merge uEnv in extlinux.conf
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--libre/uboot4extlinux-am335x/PKGBUILD7
-rw-r--r--libre/uboot4extlinux-am335x/extlinux.conf16
-rw-r--r--libre/uboot4extlinux-am335x/uEnv.txt1
3 files changed, 10 insertions, 14 deletions
diff --git a/libre/uboot4extlinux-am335x/PKGBUILD b/libre/uboot4extlinux-am335x/PKGBUILD
index f48ac4cc5..4ce30c130 100644
--- a/libre/uboot4extlinux-am335x/PKGBUILD
+++ b/libre/uboot4extlinux-am335x/PKGBUILD
@@ -6,18 +6,16 @@
pkgbase=uboot4extlinux-am335x
pkgname=('uboot4extlinux-am335x_bone')
pkgver=2019.01
-pkgrel=1
+pkgrel=2
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
license=('GPL')
makedepends=('bc' 'bison' 'dtc' 'flex' 'python' 'python2' 'swig')
backup=(boot/extlinux/extlinux.conf)
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
- 'uEnv.txt'
'extlinux.conf')
sha256sums=('50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22'
- '4ef3c3177e4476cdb1790dd021d2383ef9913c029d005ffbeb61b958e753672e'
- '9696e3836da7cfd1920fd23891111e1ba4f160a6322db6b768b9267c4e628fa9')
+ 'dcce8acd934eef35360c9e455197b1b46455a1a35c78bc94b9ed96234f2bb2b8')
boards=('am335x_evm')
@@ -49,7 +47,6 @@ package_uboot4extlinux-am335x_bone() {
install -Dm644 \
bin_am335x_evm/MLO \
bin_am335x_evm/u-boot.img \
- "${srcdir}"/uEnv.txt \
"${pkgdir}"/boot/u-boot/images/
install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
diff --git a/libre/uboot4extlinux-am335x/extlinux.conf b/libre/uboot4extlinux-am335x/extlinux.conf
index 87891721b..160e4da86 100644
--- a/libre/uboot4extlinux-am335x/extlinux.conf
+++ b/libre/uboot4extlinux-am335x/extlinux.conf
@@ -4,40 +4,40 @@ timeout 50
label Parabola GNU/Linux-libre, linux-libre kernel
kernel /boot/vmlinuz-linux-libre
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre
label Parabola GNU/Linux-libre, linux-libre-lts kernel
kernel /boot/vmlinuz-linux-libre-lts
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-lts
label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
kernel /boot/vmlinuz-linux-libre-lts-knock
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-lts-knock
label Parabola GNU/Linux-libre, linux-libre-hardened kernel
kernel /boot/vmlinuz-linux-libre-hardened
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-hardened
label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
kernel /boot/vmlinuz-linux-libre-lts-apparmor
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-lts-apparmor
label Parabola GNU/Linux-libre, linux-libre-pck kernel
kernel /boot/vmlinuz-linux-libre-pck
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-pck
label Parabola GNU/Linux-libre, linux-libre-rt kernel
kernel /boot/vmlinuz-linux-libre-rt
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-rt
label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
kernel /boot/vmlinuz-linux-libre-xtreme
- append root=/dev/mmcblk0p1 rw console=ttyO0,115200
+ append root=/dev/mmcblk0p1 rw console=ttyO0,115200 coherent_pool=1M
fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre/uboot4extlinux-am335x/uEnv.txt b/libre/uboot4extlinux-am335x/uEnv.txt
deleted file mode 100644
index f432efc6b..000000000
--- a/libre/uboot4extlinux-am335x/uEnv.txt
+++ /dev/null
@@ -1 +0,0 @@
-optargs=coherent_pool=1M