diff options
| -rw-r--r-- | libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch | 31 | ||||
| -rw-r--r-- | libre-testing/uboot4extlinux-sunxi/PKGBUILD | 145 |
2 files changed, 143 insertions, 33 deletions
diff --git a/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch index 5b59f18af..4b93c03e9 100644 --- a/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch +++ b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch @@ -1,27 +1,29 @@ -diff -Nur u-boot-2016.01.orig/include/config_distro_defaults.h u-boot-2016.01/include/config_distro_defaults.h ---- u-boot-2016.01.orig/include/config_distro_defaults.h 2016-01-12 11:06:54.000000000 -0300 -+++ u-boot-2016.01/include/config_distro_defaults.h 2016-02-26 13:23:28.880315683 -0300 -@@ -67,4 +67,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_SYS_HUSH_PARSER + #define CONFIG_ENV_VARS_UBOOT_CONFIG +#define CONFIG_CMD_PART +#define CONFIG_PARTITION_UUIDS + #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */ -diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/include/configs/sunxi-common.h ---- u-boot-2016.01.orig/include/configs/sunxi-common.h 2016-01-12 11:06:54.000000000 -0300 -+++ u-boot-2016.01/include/configs/sunxi-common.h 2016-02-26 14:37:41.077919620 -0300 +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 */ - #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -@@ -449,6 +449,9 @@ +@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl; #define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \ "fel " @@ -31,7 +33,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl #define BOOT_TARGET_DEVICES(func) \ func(FEL, fel, na) \ BOOT_TARGET_DEVICES_MMC(func) \ -@@ -457,6 +460,7 @@ +@@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl; BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) @@ -39,7 +41,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT #define BOOTCMD_SUNXI_COMPAT \ -@@ -474,8 +478,6 @@ +@@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl; #define BOOTCMD_SUNXI_COMPAT #endif @@ -48,7 +50,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl #ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ "preboot=usb start\0" \ -@@ -500,13 +502,13 @@ +@@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl; CONSOLE_STDOUT_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -64,3 +66,6 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl #else /* ifndef CONFIG_SPL_BUILD */ #define CONFIG_EXTRA_ENV_SETTINGS +-- +2.8.3 + diff --git a/libre-testing/uboot4extlinux-sunxi/PKGBUILD b/libre-testing/uboot4extlinux-sunxi/PKGBUILD index fb913d6ec..6f26ea12e 100644 --- a/libre-testing/uboot4extlinux-sunxi/PKGBUILD +++ b/libre-testing/uboot4extlinux-sunxi/PKGBUILD @@ -1,24 +1,32 @@ # U-Boot: sunXi # Maintainer: 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-micro' + 'uboot4extlinux-a10s-olinuxino-m' 'uboot4extlinux-a13-olinuxino' - 'uboot4extlinux-a13-olinuxino-micro' + 'uboot4extlinux-a13-olinuxinom' 'uboot4extlinux-a20-olinuxino-lime' 'uboot4extlinux-a20-olinuxino-lime2' - 'uboot4extlinux-a20-olinuxino-micro' + 'uboot4extlinux-a20-olinuxino_micro' + 'uboot4extlinux-bananapi' + 'uboot4extlinux-bananapro' + 'uboot4extlinux-chip' 'uboot4extlinux-cubieboard' 'uboot4extlinux-cubieboard2' 'uboot4extlinux-cubietruck' - 'uboot4extlinux-pcduino' - 'uboot4extlinux-pcduino3' - 'uboot4extlinux-pcduino3-nano') -pkgver=2016.01 -pkgrel=3 + 'uboot4extlinux-linksprite_pcduino' + 'uboot4extlinux-linksprite_pcduino3' + 'uboot4extlinux-linksprite_pcduino3_nano' + 'uboot4extlinux-orangepi_2' + 'uboot4extlinux-orangepi_one' + 'uboot4extlinux-orangepi_pc' + 'uboot4extlinux-orangepi_plus') +pkgver=2016.07 +pkgrel=1 arch=('armv7h') url="http://git.denx.de/u-boot.git/" license=('GPL') @@ -27,8 +35,8 @@ 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=('7d4f65fd43d4d706f5c5650e020d899d' - '8cac8444bd1d229063a150d212cc360a' +md5sums=('425a3fa610a7d972e5092a0e92276c70' + '010974bdc7a17927e9c134da8aece5eb' 'd8199207ba08d32465cc4a2b1e19da95') boards=('A10-OLinuXino-Lime' @@ -38,12 +46,19 @@ boards=('A10-OLinuXino-Lime' 'A20-OLinuXino-Lime' 'A20-OLinuXino-Lime2' 'A20-OLinuXino_MICRO' + 'Bananapi' + 'Bananapro' + 'CHIP' 'Cubieboard' 'Cubieboard2' 'Cubietruck' 'Linksprite_pcDuino' 'Linksprite_pcDuino3' - 'Linksprite_pcDuino3_Nano') + 'Linksprite_pcDuino3_Nano' + 'orangepi_2' + 'orangepi_one' + 'orangepi_pc' + 'orangepi_plus') prepare() { cd u-boot-${pkgver} @@ -79,11 +94,12 @@ package_uboot4extlinux-a10-olinuxino-lime() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-a10s-olinuxino-micro() { +package_uboot4extlinux-a10s-olinuxino-m() { pkgdesc="U-Boot with Extlinux support for A10s OLinuXino Micro" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot4extlinux-a10s-olinuxino-micro') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot @@ -103,11 +119,12 @@ package_uboot4extlinux-a13-olinuxino() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-a13-olinuxino-micro() { +package_uboot4extlinux-a13-olinuxinom() { pkgdesc="U-Boot with Extlinux support for A13 OLinuXino Micro" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot4extlinux-a13-olinuxino-micro') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot @@ -139,11 +156,12 @@ package_uboot4extlinux-a20-olinuxino-lime2() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-a20-olinuxino-micro() { +package_uboot4extlinux-a20-olinuxino_micro() { pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Micro" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot-a20-olinuxino-micro') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot @@ -151,6 +169,42 @@ package_uboot4extlinux-a20-olinuxino-micro() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } +package_uboot4extlinux-bananapi() { + pkgdesc="U-Boot with Extlinux support for Banana Pi" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + +package_uboot4extlinux-bananapro() { + pkgdesc="U-Boot with Extlinux support for Banana Pro" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + +package_uboot4extlinux-chip() { + pkgdesc="U-Boot with Extlinux support for C.H.I.P" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + package_uboot4extlinux-cubieboard() { pkgdesc="U-Boot with Extlinux support for Cubieboard" install=${pkgbase}.install @@ -158,7 +212,7 @@ package_uboot4extlinux-cubieboard() { conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') install -d "${pkgdir}"/boot/extlinux - install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin + install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } @@ -170,7 +224,7 @@ package_uboot4extlinux-cubieboard2() { conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') install -d "${pkgdir}"/boot/extlinux - install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin + install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } @@ -182,16 +236,17 @@ package_uboot4extlinux-cubietruck() { conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') install -d "${pkgdir}"/boot/extlinux - install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin + install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-pcduino() { +package_uboot4extlinux-linksprite_pcduino() { pkgdesc="U-Boot with Extlinux support for pcDuino" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot4extlinux-pcduino') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot @@ -199,11 +254,12 @@ package_uboot4extlinux-pcduino() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-pcduino3() { +package_uboot4extlinux-linksprite_pcduino3() { pkgdesc="U-Boot with Extlinux support for pcDuino3" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot4extlinux-pcduino3') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot @@ -211,14 +267,63 @@ package_uboot4extlinux-pcduino3() { install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } -package_uboot4extlinux-pcduino3-nano() { +package_uboot4extlinux-linksprite_pcduino3_nano() { pkgdesc="U-Boot with Extlinux support for pcDuino3 Nano" install=${pkgbase}.install provides=('uboot4extlinux-sunxi') conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + replaces=('uboot4extlinux-pcduino3-nano') install -d "${pkgdir}"/boot/extlinux install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux } + +package_uboot4extlinux-orangepi_2() { + pkgdesc="U-Boot with Extlinux for Orange Pi 2" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_orangepi_2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + +package_uboot4extlinux-orangepi_one() { + pkgdesc="U-Boot with Extlinux for Orange Pi One" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_orangepi_one/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + +package_uboot4extlinux-orangepi_pc() { + pkgdesc="U-Boot with Extlinux for Orange Pi PC" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_orangepi_pc/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} + +package_uboot4extlinux-orangepi_plus() { + pkgdesc="U-Boot with Extlinux for Orange Pi Plus" + install=${pkgbase}.install + provides=('uboot4extlinux-sunxi') + conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi') + + install -d "${pkgdir}"/boot/extlinux + install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot + + install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux +} |