summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch (renamed from libre/uboot-pandaboard-linux-libre/0001-parabola-arm-modifications.patch)66
-rw-r--r--libre/uboot-omap4_panda/PKGBUILD50
-rw-r--r--libre/uboot-omap4_panda/extlinux.conf46
-rw-r--r--libre/uboot-omap4_panda/uEnv.txt (renamed from libre/uboot-pandaboard-linux-libre/uEnv.txt)0
-rw-r--r--libre/uboot-omap4_panda/uboot-omap4_panda.install26
-rw-r--r--libre/uboot-pandaboard-linux-libre/PKGBUILD46
-rw-r--r--libre/uboot-pandaboard-linux-libre/uboot-pandaboard-linux-libre.install21
7 files changed, 152 insertions, 103 deletions
diff --git a/libre/uboot-pandaboard-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch
index 01c7ca80a..09aee7ce0 100644
--- a/libre/uboot-pandaboard-linux-libre/0001-parabola-arm-modifications.patch
+++ b/libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch
@@ -1,7 +1,6 @@
-diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
-index 1c93aab..e8b6c90 100644
---- a/include/configs/ti_omap4_common.h
-+++ b/include/configs/ti_omap4_common.h
+diff -Nur u-boot-2016.01.orig/include/configs/ti_omap4_common.h u-boot-2016.01/include/configs/ti_omap4_common.h
+--- u-boot-2016.01.orig/include/configs/ti_omap4_common.h 2016-01-12 11:06:54.000000000 -0300
++++ u-boot-2016.01/include/configs/ti_omap4_common.h 2016-02-24 23:19:09.761629260 -0300
@@ -46,7 +46,6 @@
* the timings to use or use pre-determined timings (based on using the
* dynamic method. Default to the static timing infomation.
@@ -10,41 +9,35 @@ index 1c93aab..e8b6c90 100644
#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-@@ -82,6 +81,12 @@
- #undef CONFIG_CMD_NET
- #undef CONFIG_CMD_NFS
+@@ -79,33 +78,74 @@
+ #define CONFIG_USB_TTY 1
+ #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
+/* Parabola GNU/Linux-libre extras */
+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-+#define CONFIG_SUPPORT_RAW_INITRD
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
++
++/* Enable Extlinux boot support */
++#define CONFIG_CMD_PXE
++#define CONFIG_MENU
++#define BOOT_TARGET_DEVICES(func)
++#include <config_distro_bootcmd.h>
+
/*
* Environment setup
*/
-@@ -89,32 +94,57 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
++ BOOTENV \
DEFAULT_LINUX_BOOT_ENV \
+ DEFAULT_MMC_TI_ARGS \
"console=ttyO2,115200n8\0" \
"fdtfile=undefined\0" \
-- "bootpart=0:2\0" \
-+ "bootpart=0:1\0" \
+ "bootpart=0:2\0" \
"bootdir=/boot\0" \
-- "bootfile=zImage\0" \
-+ "fdtdir=/boot/dtbs/linux-libre\0" \
-+ "bootfile=vmlinuz-linux-libre\0" \
-+ "rdfile=initramfs-linux-libre.img\0" \
++ "fdtdir=/boot/dtbs\0" \
+ "bootfile=zImage\0" \
++ "rdfile=initramfs-linux.img\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
- "mmcdev=0\0" \
-- "mmcroot=/dev/mmcblk0p2 rw\0" \
-- "mmcrootfstype=ext3 rootwait\0" \
-+ "optargs=\0" \
-+ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
- "mmcargs=setenv bootargs console=${console} " \
- "vram=${vram} " \
-- "root=${mmcroot} " \
-- "rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
- "source ${loadaddr}\0" \
@@ -54,11 +47,14 @@ index 1c93aab..e8b6c90 100644
- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
- "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
- "mmcboot=echo Booting from mmc${mmcdev} ...; " \
-- "run mmcargs; " \
+- "run args_mmc; " \
- "bootz ${loadaddr} - ${fdtaddr}\0" \
- "uimageboot=echo Booting from mmc${mmcdev} ...; " \
-- "run mmcargs; " \
+- "run args_mmc; " \
- "bootm ${loadaddr}\0" \
++ "optargs=\0" \
++ "mmcargs=setenv bootargs console=${console} " \
++ "vram=${vram} " \
+ "root=${root} " \
+ "${optargs}\0" \
+ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
@@ -72,17 +68,18 @@ index 1c93aab..e8b6c90 100644
+ "setenv bootpart ${devnum}:1;" \
+ "part uuid ${devtype} ${bootpart} uuid;" \
+ "setenv root PARTUUID=${uuid} rw rootwait;" \
-+ "echo Checking for: ${bootdir}/uboot-pandaboard-linux-libre/uEnv.txt ...;" \
-+ "if test -e ${devtype} ${bootpart} ${bootdir}/uboot-pandaboard-linux-libre/uEnv.txt; then " \
-+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uboot-pandaboard-linux-libre/uEnv.txt;" \
++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \
++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \
++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
+ "env import -t ${loadaddr} ${filesize};" \
-+ "echo Loaded environment from ${bootdir}/uboot-pandaboard-linux-libre/uEnv.txt;" \
++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \
+ "echo Checking if uenvcmd is set ...;" \
+ "if test -n ${uenvcmd}; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "fi;" \
++ "run scan_dev_for_boot;" \
+ "if run loadimage; then " \
+ "run mmcargs;" \
+ "if run loadfdt; then " \
@@ -101,7 +98,7 @@ index 1c93aab..e8b6c90 100644
"findfdt="\
"if test $board_name = sdp4430; then " \
"setenv fdtfile omap4-sdp.dtb; fi; " \
-@@ -127,32 +157,11 @@
+@@ -118,32 +158,11 @@
"if test $board_name = duovero; then " \
"setenv fdtfile omap4-duovero-parlor.dtb; fi;" \
"if test $fdtfile = undefined; then " \
@@ -136,6 +133,3 @@ index 1c93aab..e8b6c90 100644
/*
* Defines for SPL
---
-2.4.2
-
diff --git a/libre/uboot-omap4_panda/PKGBUILD b/libre/uboot-omap4_panda/PKGBUILD
new file mode 100644
index 000000000..c6ee4ac2a
--- /dev/null
+++ b/libre/uboot-omap4_panda/PKGBUILD
@@ -0,0 +1,50 @@
+# U-Boot: PandaBoard and PandaBoard ES
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgname=uboot-omap4_panda
+pkgver=2016.01
+pkgrel=1
+pkgdesc="U-Boot for PandaBoard and PandaBoard ES"
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard')
+conflicts=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot4grub-omap4_panda')
+makedepends=('bc')
+license=('GPL')
+backup=(boot/extlinux/extlinux.conf)
+install=${pkgname}.install
+backup=('boot/uEnv.txt')
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+ '0001-parabola-arm-modifications.patch'
+ 'extlinux.conf'
+ 'uEnv.txt')
+md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
+ 'b74e858feeed48acaba5ac0548d675ca'
+ '12c61073bb860f4c8d8ec59145c267ed'
+ '86004660f2912861a040e335c9c0e85b')
+
+prepare() {
+ cd u-boot-${pkgver}
+
+ patch -Np1 -i ../0001-parabola-arm-modifications.patch
+}
+
+build() {
+ cd u-boot-${pkgver}
+
+ unset LDFLAGS
+
+ make distclean
+ make omap4_panda_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-omap4_panda/extlinux.conf b/libre/uboot-omap4_panda/extlinux.conf
new file mode 100644
index 000000000..725121811
--- /dev/null
+++ b/libre/uboot-omap4_panda/extlinux.conf
@@ -0,0 +1,46 @@
+menu title Welcome to U-Boot with Extlinux support!
+
+label Parabola GNU/Linux-libre, linux-libre kernel
+ kernel /boot/vmlinuz-linux-libre
+ append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
+ 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# 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=ttyO2,115200n8
+# fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot-pandaboard-linux-libre/uEnv.txt b/libre/uboot-omap4_panda/uEnv.txt
index 55298e1a9..55298e1a9 100644
--- a/libre/uboot-pandaboard-linux-libre/uEnv.txt
+++ b/libre/uboot-omap4_panda/uEnv.txt
diff --git a/libre/uboot-omap4_panda/uboot-omap4_panda.install b/libre/uboot-omap4_panda/uboot-omap4_panda.install
new file mode 100644
index 000000000..52b834639
--- /dev/null
+++ b/libre/uboot-omap4_panda/uboot-omap4_panda.install
@@ -0,0 +1,26 @@
+extlinux_warning() {
+ echo ">>> WARNING: for new entries, edit /boot/extlinux/extlinux.conf"
+}
+
+flash_uboot() {
+ echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+ echo "Do this now? [y|N]"
+ read -r shouldwe
+ if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+ dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k
+ dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k
+ else
+ echo "You can do this later by running:"
+ 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"
+ fi
+ extlinux_warning
+}
+
+post_install() {
+ flash_uboot
+}
+
+post_upgrade() {
+ flash_uboot
+}
diff --git a/libre/uboot-pandaboard-linux-libre/PKGBUILD b/libre/uboot-pandaboard-linux-libre/PKGBUILD
deleted file mode 100644
index ca3f1beab..000000000
--- a/libre/uboot-pandaboard-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# U-Boot: PandaBoard and PandaBoard ES
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgname=linux-libre
-pkgname=uboot-pandaboard-${_pkgname}
-pkgver=2015.04
-pkgrel=1.1
-pkgdesc="U-Boot for PandaBoard and PandaBoard ES (built for the linux-libre kernel package)"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-makedepends=('bc')
-replaces=('uboot-pandaboard')
-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'
- 'ed3771f68122d6846dc9d906df6a1e6d'
- '86004660f2912861a040e335c9c0e85b')
-
-prepare() {
- cd u-boot-${pkgver}
-
- patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
- cd u-boot-${pkgver}
-
- unset LDFLAGS
-
- make distclean
- make omap4_panda_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-pandaboard-linux-libre/uboot-pandaboard-linux-libre.install b/libre/uboot-pandaboard-linux-libre/uboot-pandaboard-linux-libre.install
deleted file mode 100644
index 8d28bcdcf..000000000
--- a/libre/uboot-pandaboard-linux-libre/uboot-pandaboard-linux-libre.install
+++ /dev/null
@@ -1,21 +0,0 @@
-flash_uboot() {
- echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
- echo "Do this now? [y|N]"
- read -r shouldwe
- if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
- dd if=/boot/uboot-pandaboard-linux-libre/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k
- dd if=/boot/uboot-pandaboard-linux-libre/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k
- else
- echo "You can do this later by running:"
- echo "# dd if=/boot/uboot-pandaboard-linux-libre/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k"
- echo "# dd if=/boot/uboot-pandaboard-linux-libre/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k"
- fi
-}
-
-post_install() {
- flash_uboot
-}
-
-post_upgrade() {
- flash_uboot
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 12:05:55 +0000