From 49fef4a963e1b2163a000a6b65e2f4d61bd171ae Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 12 Dec 2021 22:45:00 +0100 Subject: libre-testing: remove outdated u-boot packages All these u-boot pakcages were consolidated in SOC specific packages instead of board specific pakcages in libre. In addition the libre packages are more recent and in sync with the Parabola armv7h installation manual. Signed-off-by: Denis 'GNUtoo' Carikli --- .../0001-parabola-arm-modifications.patch | 62 ---------------------- libre-testing/uboot4extlinux-omap4_panda/PKGBUILD | 47 ---------------- .../uboot4extlinux-omap4_panda/extlinux.conf | 43 --------------- libre-testing/uboot4extlinux-omap4_panda/uEnv.txt | 2 - .../uboot4extlinux-omap4_panda.install | 26 --------- 5 files changed, 180 deletions(-) delete mode 100644 libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch delete mode 100644 libre-testing/uboot4extlinux-omap4_panda/PKGBUILD delete mode 100644 libre-testing/uboot4extlinux-omap4_panda/extlinux.conf delete mode 100644 libre-testing/uboot4extlinux-omap4_panda/uEnv.txt delete mode 100644 libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install (limited to 'libre-testing/uboot4extlinux-omap4_panda') diff --git a/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch deleted file mode 100644 index 6f8666775..000000000 --- a/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig -index 8d9024854..3d7ffc39c 100644 ---- a/configs/omap4_panda_defconfig -+++ b/configs/omap4_panda_defconfig -@@ -10,6 +10,10 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y - CONFIG_VERSION_VARIABLE=y - CONFIG_SPL=y - CONFIG_SPL_OS_BOOT=y -+CONFIG_AUTOBOOT_KEYED=y -+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -+CONFIG_AUTOBOOT_DELAY_STR="d" -+CONFIG_AUTOBOOT_STOP_STR=" " - # CONFIG_CMD_IMLS is not set - CONFIG_CMD_ASKENV=y - # CONFIG_CMD_FLASH is not set -@@ -20,8 +24,8 @@ CONFIG_CMD_USB=y - CONFIG_CMD_GPIO=y - # CONFIG_CMD_SETEXPR is not set - # CONFIG_CMD_NFS is not set --CONFIG_CMD_EXT4_WRITE=y - CONFIG_SYS_NS16550=y - CONFIG_USB=y - CONFIG_USB_STORAGE=y - CONFIG_OF_LIBFDT=y -+CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre" -diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index 8e0f9eb96..a2eb1f9ff 100644 ---- a/include/configs/ti_omap4_common.h -+++ b/include/configs/ti_omap4_common.h -@@ -42,7 +42,7 @@ - * the timings to use or use pre-determined timings (based on using the - * dynamic method. Default to the static timing infomation. - */ --#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS -+/*#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS*/ - #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS - #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION - #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS -@@ -74,6 +74,12 @@ - #define CONFIG_USB_DEVICE 1 - #define CONFIG_USB_TTY 1 - -+/* Enable Extlinux boot support */ -+#define CONFIG_CMD_PXE -+#define CONFIG_MENU -+#define BOOT_TARGET_DEVICES(func) -+#include -+ - /* - * Environment setup - */ -@@ -91,9 +97,8 @@ - - #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ -- func(LEGACY_MMC, legacy_mmc, 0) \ - func(MMC, mmc, 1) \ -- func(LEGACY_MMC, legacy_mmc, 1) \ -+ func(USB, usb, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - diff --git a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD deleted file mode 100644 index edfd4f48d..000000000 --- a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# U-Boot: PandaBoard and PandaBoard ES -# Maintainer: Isaac David -# Contributor: André Silva - -pkgname=uboot4extlinux-omap4_panda -pkgver=2017.01 -pkgrel=1.1 -pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -conflicts=('uboot-omap4_panda' 'uboot4grub-omap4_panda') -makedepends=('bc') -license=('GPL') -install=${pkgname}.install -backup=('boot/extlinux/extlinux.conf' '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') -sha256sums=('6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2' - 'dbdfef11ac6ef81add6a7d5983e715538583738561409e35de393a0bc2185772' - 'bb489334db2d44562caa18ed6297068cf7df3afdf1bb8b1b1f27bce0d2b8e987' - '79c60872095fb4a421a532ce918ffb0927398a83df028578aebf46f54a4d6ed6') - -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-testing/uboot4extlinux-omap4_panda/extlinux.conf b/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf deleted file mode 100644 index bb48ab97f..000000000 --- a/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf +++ /dev/null @@ -1,43 +0,0 @@ -menu title Welcome to U-Boot with Extlinux support! - -timeout 50 - -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-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-hardened kernel - kernel /boot/vmlinuz-linux-libre-hardened - append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8 - 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=ttyO2,115200n8 - 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=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 - -label Parabola GNU/Linux-libre, linux-libre-xtreme kernel - kernel /boot/vmlinuz-linux-libre-xtreme - append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8 - fdtdir /boot/dtbs/linux-libre-xtreme diff --git a/libre-testing/uboot4extlinux-omap4_panda/uEnv.txt b/libre-testing/uboot4extlinux-omap4_panda/uEnv.txt deleted file mode 100644 index 55298e1a9..000000000 --- a/libre-testing/uboot4extlinux-omap4_panda/uEnv.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Uncomment and add any additional kernel parameters to optargs -#optargs= diff --git a/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install b/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install deleted file mode 100644 index defbc061d..000000000 --- a/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install +++ /dev/null @@ -1,26 +0,0 @@ -extlinux_warning() { - echo "==> WARNING: Remember to set up your kernels in /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 -} -- cgit v1.2.3