From a63182bc739fa2ef86861a939898717e04cb7153 Mon Sep 17 00:00:00 2001 From: Isaac David Date: Fri, 9 Jun 2017 15:44:53 -0500 Subject: libre-testing/uboot4extlinux-*: new versions and configs also patch old u-boot tarballs to build with gcc7 --- .../0001-parabola-arm-modifications.patch | 157 ++++++--------------- libre-testing/uboot4extlinux-omap4_panda/PKGBUILD | 13 +- .../uboot4extlinux-omap4_panda.install | 2 +- 3 files changed, 49 insertions(+), 123 deletions(-) (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 index 09aee7ce0..6f8666775 100644 --- a/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch +++ b/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch @@ -1,21 +1,45 @@ -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 @@ +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 -@@ -79,33 +78,74 @@ +@@ -74,6 +74,12 @@ + #define CONFIG_USB_DEVICE 1 #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" -+ +/* Enable Extlinux boot support */ +#define CONFIG_CMD_PXE +#define CONFIG_MENU @@ -25,111 +49,14 @@ diff -Nur u-boot-2016.01.orig/include/configs/ti_omap4_common.h u-boot-2016.01/i /* * Environment setup */ - #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" \ - "bootdir=/boot\0" \ -+ "fdtdir=/boot/dtbs\0" \ - "bootfile=zImage\0" \ -+ "rdfile=initramfs-linux.img\0" \ - "usbtty=cdc_acm\0" \ - "vram=16M\0" \ -- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ -- "source ${loadaddr}\0" \ -- "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ -- "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ -- "env import -t ${loadaddr} ${filesize}\0" \ -- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \ -- "mmcboot=echo Booting from mmc${mmcdev} ...; " \ -- "run args_mmc; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" \ -- "uimageboot=echo Booting from mmc${mmcdev} ...; " \ -- "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" \ -+ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ -+ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ -+ "mmcboot=usb start;" \ -+ "for devtype in mmc usb; do " \ -+ "setenv devnum 0;" \ -+ "while ${devtype} dev ${devnum}; do " \ -+ "echo ${devtype} found on device ${devnum};" \ -+ "setenv bootpart ${devnum}:1;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait;" \ -+ "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}/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 " \ -+ "if run loadrd; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "fi;" \ -+ "else " \ -+ "echo No kernel found;" \ -+ "fi;" \ -+ "setexpr devnum ${devnum} + 1;" \ -+ "done;" \ -+ "done;\0" \ - "findfdt="\ - "if test $board_name = sdp4430; then " \ - "setenv fdtfile omap4-sdp.dtb; fi; " \ -@@ -118,32 +158,11 @@ - "if test $board_name = duovero; then " \ - "setenv fdtfile omap4-duovero-parlor.dtb; fi;" \ - "if test $fdtfile = undefined; then " \ -- "echo WARNING: Could not determine device tree to use; fi; \0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -+ "echo WARNING: Could not determine device tree to use; fi; \0" +@@ -91,9 +97,8 @@ - #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ -- "mmc dev ${mmcdev}; if mmc rescan; then " \ -- "echo SD/MMC found on device ${mmcdev};" \ -- "if run loadbootscript; then " \ -- "run bootscript; " \ -- "else " \ -- "if run loadbootenv; then " \ -- "run importbootenv; " \ -- "fi;" \ -- "if test -n ${uenvcmd}; then " \ -- "echo Running uenvcmd ...;" \ -- "run uenvcmd;" \ -- "fi;" \ -- "fi;" \ -- "if run loadimage; then " \ -- "run loadfdt;" \ -- "run mmcboot; " \ -- "fi; " \ -- "if run loaduimage; then " \ -- "run uimageboot;" \ -- "fi; " \ -- "fi" -+ "run mmcboot" + #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) - /* - * Defines for SPL diff --git a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD index b9e5d9826..7f3affc71 100644 --- a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD +++ b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD @@ -1,11 +1,10 @@ # U-Boot: PandaBoard and PandaBoard ES -# Maintainer: André Silva - -buildarch=4 +# Maintainer: Isaac David +# Contributor: André Silva pkgname=uboot4extlinux-omap4_panda -pkgver=2016.01 -pkgrel=4 +pkgver=2017.01 +pkgrel=1 pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES" arch=('armv7h') url="http://git.denx.de/u-boot.git/" @@ -18,8 +17,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" '0001-parabola-arm-modifications.patch' 'extlinux.conf' 'uEnv.txt') -sha256sums=('e5792fba9399d9804aa2ef667f14ff771e2cdece72367d340250265bf095a5d5' - '1325236fc382a85d434f8f53dd320aa026b228476125745bc9800e6a03060ab5' +sha256sums=('6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2' + 'dbdfef11ac6ef81add6a7d5983e715538583738561409e35de393a0bc2185772' '2beea4827d7c85968c4edbd1ddfd7a70d6170bf030d6254b37fb6455ba8bf165' '79c60872095fb4a421a532ce918ffb0927398a83df028578aebf46f54a4d6ed6') diff --git a/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install b/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install index 771f1f0b3..defbc061d 100644 --- a/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install +++ b/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install @@ -1,5 +1,5 @@ extlinux_warning() { - echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf" + echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf" } flash_uboot() { -- cgit v1.2.3