From 3cc20cbac18f7e65b50643cd3a25be2211a76e9a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 2 Mar 2016 02:47:37 -0300
Subject: uboot-cubox: add new package to [libre]

---
 libre/uboot-cubox-linux-libre/PKGBUILD | 27 ---------------------------
 libre/uboot-cubox-linux-libre/boot.txt | 12 ------------
 libre/uboot-cubox/PKGBUILD             | 26 ++++++++++++++++++++++++++
 libre/uboot-cubox/boot.txt             | 12 ++++++++++++
 4 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 libre/uboot-cubox-linux-libre/PKGBUILD
 delete mode 100644 libre/uboot-cubox-linux-libre/boot.txt
 create mode 100644 libre/uboot-cubox/PKGBUILD
 create mode 100644 libre/uboot-cubox/boot.txt

(limited to 'libre')

diff --git a/libre/uboot-cubox-linux-libre/PKGBUILD b/libre/uboot-cubox-linux-libre/PKGBUILD
deleted file mode 100644
index c21351825..000000000
--- a/libre/uboot-cubox-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# U-Boot: CuBox (Dove)
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgname=linux-libre
-pkgname=uboot-cubox-${_pkgname}
-pkgver=2009.08
-pkgrel=1
-pkgdesc="U-Boot for CuBox (Dove) (built for the linux-libre kernel package)"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('uboot-tools')
-depends=('linux-libre')
-replaces=('uboot-cubox')
-backup=("boot/${pkgname}/boot.scr")
-_commit=814386d3e43b8ab8d81f04aa7fe402952503d8fe
-source=('boot.txt')                                                                                 
-md5sums=('96fdd33ef33cb55d50e97dbd86a871a3')
-
-package() {
-  mkimage -A arm -O linux -T script -C none -n "Boot script" -d boot.txt boot.scr
-  mkdir -p "${pkgdir}/boot/${pkgname}"
-  cp boot.scr "${pkgdir}/boot/${pkgname}"
-}
diff --git a/libre/uboot-cubox-linux-libre/boot.txt b/libre/uboot-cubox-linux-libre/boot.txt
deleted file mode 100644
index 690562173..000000000
--- a/libre/uboot-cubox-linux-libre/boot.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-echo ======== Starting boot ========
-usb start
-setenv uimagearg 'uImage-linux-libre'
-setenv uinitarg 'uInitrd-linux-libre'
-setenv my1arg 'console=ttyS0,115200n8 console=tty1,115200n8'
-setenv my2arg 'vmalloc=384M video=dovefb:lcd0:1280x720-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0'
-ext2load ide 0:1 0x04000000 /boot/${uinitarg} && ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000
-ext2load usb 0:1 0x04000000 /boot/${uinitarg} && ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000
-ext2load mmc 0:1 0x04000000 /boot/${uinitarg} && ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000 0x04000000
-ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000
-ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000
-ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000
diff --git a/libre/uboot-cubox/PKGBUILD b/libre/uboot-cubox/PKGBUILD
new file mode 100644
index 000000000..42614682e
--- /dev/null
+++ b/libre/uboot-cubox/PKGBUILD
@@ -0,0 +1,26 @@
+# U-Boot: CuBox (Dove)
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgname=uboot-cubox
+pkgver=2009.08
+pkgrel=1.parabola1
+pkgdesc="U-Boot for CuBox (Dove)"
+arch=('armv7h')
+url="https://projects.parabola.nu/abslibre.git/"
+license=('GPL')
+makedepends=('uboot-tools')
+depends=('linux-libre')
+replaces=('uboot-cubox-linux-libre')
+conflicts=('uboot4extlinux-cubox' 'uboot4grub-cubox')
+backup=('boot/boot.scr')   
+_commit=814386d3e43b8ab8d81f04aa7fe402952503d8fe
+source=('boot.txt')                                                                                 
+md5sums=('02356c39d1e254e3f64c016be3895191')
+
+package() {
+  mkimage -A arm -O linux -T script -C none -n "Boot script" -d boot.txt boot.scr
+  mkdir -p "${pkgdir}"/boot
+  cp boot.scr "${pkgdir}"/boot
+}
diff --git a/libre/uboot-cubox/boot.txt b/libre/uboot-cubox/boot.txt
new file mode 100644
index 000000000..348639632
--- /dev/null
+++ b/libre/uboot-cubox/boot.txt
@@ -0,0 +1,12 @@
+echo ======== Starting boot ========
+usb start
+setenv uimagearg 'uImage'
+setenv uinitarg 'uInitrd'
+setenv my1arg 'console=ttyS0,115200n8 console=tty1,115200n8'
+setenv my2arg 'vmalloc=384M video=dovefb:lcd0:1280x720-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0'
+ext2load ide 0:1 0x04000000 /boot/${uinitarg} && ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000
+ext2load usb 0:1 0x04000000 /boot/${uinitarg} && ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000
+ext2load mmc 0:1 0x04000000 /boot/${uinitarg} && ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000 0x04000000
+ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000
+ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000
+ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000
-- 
cgit v1.2.3