summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch21
-rw-r--r--libre/uboot4extlinux-sunxi/PKGBUILD21
-rw-r--r--libre/uboot4extlinux-sunxi/extlinux.conf88
-rw-r--r--libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install5
4 files changed, 60 insertions, 75 deletions
diff --git a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
index 4b93c03e9..17f067484 100644
--- a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
@@ -1,28 +1,7 @@
-diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
-index 766a212..0df77cd 100644
---- a/include/config_distro_defaults.h
-+++ b/include/config_distro_defaults.h
-@@ -57,4 +57,7 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_ENV_VARS_UBOOT_CONFIG
-
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+
- #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 94275a7..ed1aac6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
-@@ -173,7 +173,7 @@
- #define CONFIG_SYS_NO_FLASH
-
- #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */
--#define CONFIG_IDENT_STRING " Allwinner Technology"
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
- #define CONFIG_DISPLAY_BOARDINFO
-
- #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */
@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl;
#define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
"fel "
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index 6f26ea12e..1944b0987 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -1,9 +1,8 @@
# U-Boot: sunXi
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@parabola.nu>
# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
-buildarch=4
-
pkgbase=uboot4extlinux-sunxi
pkgname=('uboot4extlinux-a10-olinuxino-lime'
'uboot4extlinux-a10s-olinuxino-m'
@@ -25,19 +24,19 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
'uboot4extlinux-orangepi_one'
'uboot4extlinux-orangepi_pc'
'uboot4extlinux-orangepi_plus')
-pkgver=2016.07
+pkgver=2017.01
pkgrel=1
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
license=('GPL')
-makedepends=('bc' 'dtc')
+makedepends=('bc' 'dtc' 'python2')
backup=(boot/extlinux/extlinux.conf)
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-parabola-arm-modifications.patch'
'extlinux.conf')
-md5sums=('425a3fa610a7d972e5092a0e92276c70'
- '010974bdc7a17927e9c134da8aece5eb'
- 'd8199207ba08d32465cc4a2b1e19da95')
+sha256sums=('6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2'
+ 'f5613a2136685fd338b6312806c793ca6a97ad5ae39e02950fd997e000919398'
+ 'f8ec58bfc8f9b945c8419b00bddde5235d06f4d55de3a9792a9557b0b684c030')
boards=('A10-OLinuXino-Lime'
'A10s-OLinuXino-M'
@@ -64,19 +63,19 @@ prepare() {
cd u-boot-${pkgver}
patch -Np1 -i ../0001-parabola-arm-modifications.patch
+ sed -i 's/env python$/&2/' tools/binman/binman{,.py}
}
build() {
cd u-boot-${pkgver}
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
+ unset CFLAGS CXXFLAGS LDFLAGS
for i in ${boards[@]}; do
mkdir ../bin_${i}
make distclean
make ${i}_config
+ echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
make EXTRAVERSION=-${pkgrel}
mv u-boot-sunxi-with-spl.bin ../bin_${i}
done
diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre/uboot4extlinux-sunxi/extlinux.conf
index bed31281c..34b2ebc97 100644
--- a/libre/uboot4extlinux-sunxi/extlinux.conf
+++ b/libre/uboot4extlinux-sunxi/extlinux.conf
@@ -7,42 +7,52 @@ label Parabola GNU/Linux-libre, linux-libre kernel
append root=/dev/mmcblk0p1 rw console=ttyS0,115200
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=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-lts
-
-#label Parabola GNU/Linux-libre, linux-libre-knock kernel
-# kernel /boot/vmlinuz-linux-libre-knock
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
-# kernel /boot/vmlinuz-linux-libre-lts-knock
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-# kernel /boot/vmlinuz-linux-libre-grsec
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-# kernel /boot/vmlinuz-linux-libre-grsec-knock
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-# kernel /boot/vmlinuz-linux-libre-audit
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-audit
-
-#label Parabola GNU/Linux-libre, linux-libre-pck kernel
-# kernel /boot/vmlinuz-linux-libre-pck
-# append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-# 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=ttyS0,115200
-# fdtdir /boot/dtbs/linux-libre-rt
+label Parabola GNU/Linux-libre, linux-libre-lts kernel
+ kernel /boot/vmlinuz-linux-libre-lts
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-lts
+
+label Parabola GNU/Linux-libre, linux-libre-knock kernel
+ kernel /boot/vmlinuz-linux-libre-knock
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-knock
+
+label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
+ kernel /boot/vmlinuz-linux-libre-lts-knock
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ 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=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-hardened
+
+label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
+ kernel /boot/vmlinuz-linux-libre-apparmor
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
+ kernel /boot/vmlinuz-linux-libre-lts-apparmor
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-lts-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-audit kernel
+ kernel /boot/vmlinuz-linux-libre-audit
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-audit
+
+label Parabola GNU/Linux-libre, linux-libre-pck kernel
+ kernel /boot/vmlinuz-linux-libre-pck
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ 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=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-rt
+
+label Parabola GNU/Linux-libre, linux-libre-xen kernel
+ kernel /boot/vmlinuz-linux-libre-xen
+ append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+ fdtdir /boot/dtbs/linux-libre-xen
diff --git a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
index e39c2cd2e..51b209923 100644
--- a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
+++ b/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
@@ -1,5 +1,5 @@
extlinux_warning() {
- echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
+ echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf"
}
flash_uboot() {
@@ -15,13 +15,10 @@ flash_uboot() {
extlinux_warning
}
-## arg 1: the new package version
post_install() {
flash_uboot
}
-## arg 1: the new package version
-## arg 2: the old package version
post_upgrade() {
flash_uboot
}