diff options
| -rw-r--r-- | libre-testing/uboot4extlinux-nitrogen6q/0001-parabola-arm-modifications.patch | 240 | ||||
| -rw-r--r-- | libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD | 2 |
2 files changed, 241 insertions, 1 deletions
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-nitrogen6q/0001-parabola-arm-modifications.patch index 357f61a29..da61e010b 100644 --- a/libre-testing/uboot4extlinux-nitrogen6q/0001-parabola-arm-modifications.patch +++ b/libre-testing/uboot4extlinux-nitrogen6q/0001-parabola-arm-modifications.patch @@ -1,3 +1,243 @@ +diff -Nur u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a.orig/include/config_distro_bootcmd.h u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a/include/config_distro_bootcmd.h +--- u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a.orig/include/config_distro_bootcmd.h 1969-12-31 21:00:00.000000000 -0300 ++++ u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a/include/config_distro_bootcmd.h 2015-04-13 11:53:03.000000000 -0300 +@@ -0,0 +1,236 @@ ++/* ++ * (C) Copyright 2014 ++ * NVIDIA Corporation <www.nvidia.com> ++ * ++ * Copyright 2014 Red Hat, Inc. ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef _CONFIG_CMD_DISTRO_BOOTCMD_H ++#define _CONFIG_CMD_DISTRO_BOOTCMD_H ++ ++/* ++ * A note on error handling: It is possible for BOOT_TARGET_DEVICES to ++ * reference a device that is not enabled in the U-Boot configuration, e.g. ++ * it may include MMC in the list without CONFIG_CMD_MMC being enabled. Given ++ * that BOOT_TARGET_DEVICES is a macro that's expanded by the C pre-processor ++ * at compile time, it's not possible to detect and report such problems via ++ * a simple #ifdef/#error combination. Still, the code needs to report errors. ++ * The best way I've found to do this is to make BOOT_TARGET_DEVICES expand to ++ * reference a non-existent symbol, and have the name of that symbol encode ++ * the error message. Consequently, this file contains references to e.g. ++ * BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC. Given the ++ * prevalence of capitals here, this looks like a pre-processor macro and ++ * hence seems like it should be all capitals, but it's really an error ++ * message that includes some other pre-processor symbols in the text. ++ */ ++ ++/* We need the part command */ ++#define CONFIG_PARTITION_UUIDS ++#define CONFIG_CMD_PART ++ ++#define BOOTENV_SHARED_BLKDEV_BODY(devtypel) \ ++ "if " #devtypel " dev ${devnum}; then " \ ++ "setenv devtype " #devtypel "; " \ ++ "run scan_dev_for_boot_part; " \ ++ "fi\0" ++ ++#define BOOTENV_SHARED_BLKDEV(devtypel) \ ++ #devtypel "_boot=" \ ++ BOOTENV_SHARED_BLKDEV_BODY(devtypel) ++ ++#define BOOTENV_DEV_BLKDEV(devtypeu, devtypel, instance) \ ++ "bootcmd_" #devtypel #instance "=" \ ++ "setenv devnum " #instance "; " \ ++ "run " #devtypel "_boot\0" ++ ++#define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \ ++ #devtypel #instance " " ++ ++#ifdef CONFIG_CMD_MMC ++#define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc) ++#define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV ++#define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV ++#else ++#define BOOTENV_SHARED_MMC ++#define BOOTENV_DEV_MMC \ ++ BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC ++#define BOOTENV_DEV_NAME_MMC \ ++ BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC ++#endif ++ ++#ifdef CONFIG_CMD_SATA ++#define BOOTENV_SHARED_SATA BOOTENV_SHARED_BLKDEV(sata) ++#define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV ++#define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV ++#else ++#define BOOTENV_SHARED_SATA ++#define BOOTENV_DEV_SATA \ ++ BOOT_TARGET_DEVICES_references_SATA_without_CONFIG_CMD_SATA ++#define BOOTENV_DEV_NAME_SATA \ ++ BOOT_TARGET_DEVICES_references_SATA_without_CONFIG_CMD_SATA ++#endif ++ ++#ifdef CONFIG_CMD_SCSI ++#define BOOTENV_RUN_SCSI_INIT "run scsi_init; " ++#define BOOTENV_SET_SCSI_NEED_INIT "setenv scsi_need_init; " ++#define BOOTENV_SHARED_SCSI \ ++ "scsi_init=" \ ++ "if ${scsi_need_init}; then " \ ++ "setenv scsi_need_init false; " \ ++ "scsi scan; " \ ++ "fi\0" \ ++ \ ++ "scsi_boot=" \ ++ BOOTENV_RUN_SCSI_INIT \ ++ BOOTENV_SHARED_BLKDEV_BODY(scsi) ++#define BOOTENV_DEV_SCSI BOOTENV_DEV_BLKDEV ++#define BOOTENV_DEV_NAME_SCSI BOOTENV_DEV_NAME_BLKDEV ++#else ++#define BOOTENV_RUN_SCSI_INIT ++#define BOOTENV_SET_SCSI_NEED_INIT ++#define BOOTENV_SHARED_SCSI ++#define BOOTENV_DEV_SCSI \ ++ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI ++#define BOOTENV_DEV_NAME_SCSI \ ++ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI ++#endif ++ ++#ifdef CONFIG_CMD_IDE ++#define BOOTENV_SHARED_IDE BOOTENV_SHARED_BLKDEV(ide) ++#define BOOTENV_DEV_IDE BOOTENV_DEV_BLKDEV ++#define BOOTENV_DEV_NAME_IDE BOOTENV_DEV_NAME_BLKDEV ++#else ++#define BOOTENV_SHARED_IDE ++#define BOOTENV_DEV_IDE \ ++ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE ++#define BOOTENV_DEV_NAME_IDE \ ++ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE ++#endif ++ ++#ifdef CONFIG_CMD_USB ++#define BOOTENV_RUN_USB_INIT "usb start; " ++#define BOOTENV_SHARED_USB \ ++ "usb_boot=" \ ++ BOOTENV_RUN_USB_INIT \ ++ BOOTENV_SHARED_BLKDEV_BODY(usb) ++#define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV ++#define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV ++#else ++#define BOOTENV_RUN_USB_INIT ++#define BOOTENV_SHARED_USB ++#define BOOTENV_DEV_USB \ ++ BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB ++#define BOOTENV_DEV_NAME_USB \ ++ BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB ++#endif ++ ++#if defined(CONFIG_CMD_DHCP) ++#define BOOTENV_DEV_DHCP(devtypeu, devtypel, instance) \ ++ "bootcmd_dhcp=" \ ++ BOOTENV_RUN_USB_INIT \ ++ "if dhcp ${scriptaddr} ${boot_script_dhcp}; then " \ ++ "source ${scriptaddr}; " \ ++ "fi\0" ++#define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \ ++ "dhcp " ++#else ++#define BOOTENV_DEV_DHCP \ ++ BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP ++#define BOOTENV_DEV_NAME_DHCP \ ++ BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP ++#endif ++ ++#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE) ++#define BOOTENV_DEV_PXE(devtypeu, devtypel, instance) \ ++ "bootcmd_pxe=" \ ++ BOOTENV_RUN_USB_INIT \ ++ "dhcp; " \ ++ "if pxe get; then " \ ++ "pxe boot; " \ ++ "fi\0" ++#define BOOTENV_DEV_NAME_PXE(devtypeu, devtypel, instance) \ ++ "pxe " ++#else ++#define BOOTENV_DEV_PXE \ ++ BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE ++#define BOOTENV_DEV_NAME_PXE \ ++ BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE ++#endif ++ ++#define BOOTENV_DEV_NAME(devtypeu, devtypel, instance) \ ++ BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance) ++#define BOOTENV_BOOT_TARGETS \ ++ "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0" ++ ++#define BOOTENV_DEV(devtypeu, devtypel, instance) \ ++ BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance) ++#define BOOTENV \ ++ BOOTENV_SHARED_MMC \ ++ BOOTENV_SHARED_USB \ ++ BOOTENV_SHARED_SATA \ ++ BOOTENV_SHARED_SCSI \ ++ BOOTENV_SHARED_IDE \ ++ "boot_prefixes=/ /boot/\0" \ ++ "boot_scripts=boot.scr.uimg boot.scr\0" \ ++ "boot_script_dhcp=boot.scr.uimg\0" \ ++ BOOTENV_BOOT_TARGETS \ ++ \ ++ "boot_extlinux=" \ ++ "sysboot ${devtype} ${devnum}:${bootpart} any " \ ++ "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \ ++ \ ++ "scan_dev_for_extlinux=" \ ++ "if test -e ${devtype} ${devnum}:${bootpart} " \ ++ "${prefix}extlinux/extlinux.conf; then " \ ++ "echo Found ${prefix}extlinux/extlinux.conf; " \ ++ "run boot_extlinux; " \ ++ "echo SCRIPT FAILED: continuing...; " \ ++ "fi\0" \ ++ \ ++ "boot_a_script=" \ ++ "load ${devtype} ${devnum}:${bootpart} " \ ++ "${scriptaddr} ${prefix}${script}; " \ ++ "source ${scriptaddr}\0" \ ++ \ ++ "scan_dev_for_scripts=" \ ++ "for script in ${boot_scripts}; do " \ ++ "if test -e ${devtype} ${devnum}:${bootpart} " \ ++ "${prefix}${script}; then " \ ++ "echo Found U-Boot script " \ ++ "${prefix}${script}; " \ ++ "run boot_a_script; " \ ++ "echo SCRIPT FAILED: continuing...; " \ ++ "fi; " \ ++ "done\0" \ ++ \ ++ "scan_dev_for_boot=" \ ++ "echo Scanning ${devtype} ${devnum}:${bootpart}...; " \ ++ "for prefix in ${boot_prefixes}; do " \ ++ "run scan_dev_for_extlinux; " \ ++ "run scan_dev_for_scripts; " \ ++ "done\0" \ ++ \ ++ "scan_dev_for_boot_part=" \ ++ "part list ${devtype} ${devnum} -bootable devplist; " \ ++ "env exists devplist || setenv devplist 1; " \ ++ "for bootpart in ${devplist}; do " \ ++ "if fstype ${devtype} ${devnum}:${bootpart} " \ ++ "bootfstype; then " \ ++ "run scan_dev_for_boot; " \ ++ "fi; " \ ++ "done\0" \ ++ \ ++ BOOT_TARGET_DEVICES(BOOTENV_DEV) \ ++ \ ++ "distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \ ++ "for target in ${boot_targets}; do " \ ++ "run bootcmd_${target}; " \ ++ "done\0" ++ ++#ifndef CONFIG_BOOTCOMMAND ++#define CONFIG_BOOTCOMMAND "run distro_bootcmd" ++#endif ++ ++#endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */ diff -Nur u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a.orig/include/configs/nitrogen6x.h u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a/include/configs/nitrogen6x.h --- u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a.orig/include/configs/nitrogen6x.h 2015-05-20 19:13:03.000000000 -0300 +++ u-boot-imx6-bb9dde563768731423fd6c560e95e1793a90710a/include/configs/nitrogen6x.h 2016-02-28 00:02:35.355409391 -0300 diff --git a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD index 83a69c4ad..96d4112ca 100644 --- a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD +++ b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD @@ -23,7 +23,7 @@ source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.g '0005-common-board-use-__weak.patch' '0006-common-board_f-cosmetic-use-__weak-for-leds.patch') md5sums=('b12f5f383c57de06f16625b3465e74d9' - '0cd5580fefd5abb6e09d8e9a964b932c' + 'ad04be1baecb91dd55e362a90fdc858c' '721a46867e189d8dedc6b6f86a536a34' 'f6b687eca2d2d01f741cbda90dbacb41' '8087672256020417438b12ec4946e1cf' |