From 67c574bbda146dbaf74221f9c520973d633bab62 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 14 Aug 2020 16:11:22 +0200 Subject: libre: Merge uboot4extlinux{am335x,omap3}, uboot-omap4_panda: into uboot4extlinux-ti-soc uboot4extlinux-am335x and uboot4extlinux-omap3 were almost identical, the only difference was the extlinux.conf file. So they were migrated together in a single package for all TI SOCs. I think having a single package saves maintenance time: We only have one package to update for all the supported boards. One downside is that it can increase the compilation time, but in overal it probably saves a lot of time. Another downside is that we cannot test the package separately for each boards and have to test all the boards for each new update. However since we are very close to upstream u-boot, there is very few probability of having breakages that we don't know about. Factorizing the package can also increase confidence that it will work on the boards we don't have, by testing on the boards we have. For instance I've only been able to test this package on the following boards as I don't have any of the other boards: - Beagleboard XM - Beaglebone Green The support for the Pandaborad from uboot-omap4_panda was added along the way to furthurer unify u-boot packages. In addition the version was updated and some whitespace fixes were done. Signed-off-by: Denis 'GNUtoo' Carikli --- .../uboot4extlinux-am335x.install | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 libre/uboot4extlinux-am335x/uboot4extlinux-am335x.install (limited to 'libre/uboot4extlinux-am335x/uboot4extlinux-am335x.install') diff --git a/libre/uboot4extlinux-am335x/uboot4extlinux-am335x.install b/libre/uboot4extlinux-am335x/uboot4extlinux-am335x.install deleted file mode 100644 index f33e8c1e3..000000000 --- a/libre/uboot4extlinux-am335x/uboot4extlinux-am335x.install +++ /dev/null @@ -1,37 +0,0 @@ -flash_instructions() { - echo "# dd if=/boot/u-boot/images/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/u-boot/images/u-boot.img of=/dev/mmcblk0 count=6 seek=2 conv=notrunc bs=128k" -} - -extlinux_warning() { - echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf" -} - -flash_uboot() { - root=$(mount | awk '/ on \/ / { print $1; }') - if [[ $root =~ ^/dev/mmcblk.*$ ]]; then - root=${root:0:12} - echo "A new U-Boot version needs to be flashed onto $root." - echo "Do you want to do this now? [y|N]" - read -r shouldwe - if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/u-boot/images/MLO of=$root bs=128k seek=1 count=1 conv=notrunc - dd if=/boot/u-boot/images/u-boot.img of=$root bs=128k seek=2 count=6 conv=notrunc - else - echo "You can do this later by running:" - flash_instructions - fi - else - echo "Flash the new U-Boot version onto your boot device. For example:" - flash_instructions - fi - extlinux_warning -} - -post_install() { - flash_uboot -} - -post_upgrade() { - flash_uboot -} -- cgit v1.2.3