summaryrefslogtreecommitdiff
path: root/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch')
-rw-r--r--libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch423
1 files changed, 0 insertions, 423 deletions
diff --git a/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
deleted file mode 100644
index fc41962ef..000000000
--- a/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-diff -Nur u-boot-2014.07.orig/include/config_distro_bootcmd.h u-boot-2014.07/include/config_distro_bootcmd.h
---- u-boot-2014.07.orig/include/config_distro_bootcmd.h 1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2014.07/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-2014.07.orig/include/configs/chiliboard.h u-boot-2014.07/include/configs/chiliboard.h
---- u-boot-2014.07.orig/include/configs/chiliboard.h 2016-02-25 00:53:19.766846991 -0300
-+++ u-boot-2014.07/include/configs/chiliboard.h 2016-02-25 00:57:01.436205462 -0300
-@@ -124,7 +124,6 @@
- * as that will normally be within the kernel lowmem and thus visible via
- * bootm_size and we only run on platforms with 256MB or more of memory.
- */
--#ifdef CONFIG_RAM128MB
- #define DEFAULT_LINUX_BOOT_ENV \
- "loadaddr=0x82000000\0" \
- "kernel_addr_r=0x82000000\0" \
-@@ -133,16 +132,6 @@
- "rdaddr=0x84080000\0" \
- "ramdisk_addr_r=0x84080000\0" \
- "bootm_size=0x8000000\0"
--#else
--#define DEFAULT_LINUX_BOOT_ENV \
-- "loadaddr=0x82000000\0" \
-- "kernel_addr_r=0x82000000\0" \
-- "fdtaddr=0x88000000\0" \
-- "fdt_addr_r=0x88000000\0" \
-- "rdaddr=0x88080000\0" \
-- "ramdisk_addr_r=0x88080000\0" \
-- "bootm_size=0x10000000\0"
--#endif
-
- /*
- * Default to a quick boot delay.
-@@ -258,6 +247,7 @@
- #define CONFIG_CMD_ASKENV
- #define CONFIG_CMD_ECHO
- #define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD
-
- /*
- * Common filesystems support. When we have removable storage we
-@@ -398,6 +388,9 @@
- #define CONFIG_EFI_PARTITION
- #define CONFIG_PARTITION_UUIDS
- #define CONFIG_CMD_PART
-+#define CONFIG_CMD_SETEXPR
-+
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-
- #ifdef CONFIG_NAND
- #ifndef CONFIG_NAND512MB
-@@ -437,12 +430,20 @@
-
- #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
-+
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+ BOOTENV \
- DEFAULT_LINUX_BOOT_ENV \
- "boot_fdt=try\0" \
-- "bootpart=0:2\0" \
-+ "bootpart=0:1\0" \
- "bootdir=/boot\0" \
-+ "fdtdir=/boot/dtbs\0" \
- "bootfile=zImage\0" \
- "fdtfile=undefined\0" \
- "console=ttyO0,115200n8\0" \
-@@ -450,9 +451,6 @@
- "uuid_disk=${uuid_gpt_disk};" \
- "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
- "optargs=\0" \
-- "mmcdev=0\0" \
-- "mmcroot=/dev/mmcblk0p2 rw\0" \
-- "mmcrootfstype=ext4 rootwait\0" \
- "rootpath=/export/rootfs\0" \
- "nfsopts=nolock\0" \
- "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
-@@ -461,8 +459,7 @@
- "ramrootfstype=ext2\0" \
- "mmcargs=setenv bootargs console=${console} " \
- "${optargs} " \
-- "root=${mmcroot} " \
-- "rootfstype=${mmcrootfstype}\0" \
-+ "root=${root}\0" \
- "spiroot=/dev/mtdblock4 rw\0" \
- "spirootfstype=jffs2\0" \
- "spisrcaddr=0xe0000\0" \
-@@ -477,46 +474,48 @@
- "root=/dev/nfs " \
- "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
- "ip=dhcp\0" \
-- "bootenv=uEnv.txt\0" \
-- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-- "importbootenv=echo Importing environment from mmc ...; " \
-- "env import -t $loadaddr $filesize\0" \
- "ramargs=setenv bootargs console=${console} " \
- "${optargs} " \
- "root=${ramroot} " \
- "rootfstype=${ramrootfstype}\0" \
-- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-- "mmcloados=run mmcargs; " \
-- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-- "if run loadfdt; then " \
-- "bootz ${loadaddr} - ${fdtaddr}; " \
-- "else " \
-- "if test ${boot_fdt} = try; then " \
-- "bootz; " \
-- "else " \
-- "echo WARN: Cannot load the DT; " \
-- "fi; " \
-- "fi; " \
-- "else " \
-- "bootz; " \
-- "fi;\0" \
-- "mmcboot=mmc dev ${mmcdev}; " \
-- "if mmc rescan; then " \
-- "echo SD/MMC found on device ${mmcdev};" \
-- "if run loadbootenv; then " \
-- "echo Loaded environment from ${bootenv};" \
-- "run importbootenv;" \
-- "fi;" \
-- "if test -n $uenvcmd; then " \
-- "echo Running uenvcmd ...;" \
-- "run uenvcmd;" \
-- "fi;" \
-- "if run loadimage; then " \
-- "run mmcloados;" \
-- "fi;" \
-- "fi;\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=for devtype in mmc; do " \
-+ "for devnum in 0 1; do " \
-+ "if ${devtype} dev ${devnum}; then " \
-+ "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;" \
-+ "fi;" \
-+ "done;" \
-+ "done;\0" \
- "spiboot=echo Booting from spi ...; " \
- "run spiargs; " \
- "sf probe ${spibusno}:0; " \
-@@ -541,9 +540,6 @@
- #define CONFIG_BOOTCOMMAND \
- "run findfdt; " \
- "run mmcboot;" \
-- "setenv mmcdev 1; " \
-- "setenv bootpart 1:2; " \
-- "run mmcboot;" \
- "run nandboot;"
-
- /* NS16550 Configuration */
generated by cgit v1.2.2 (git 2.25.0) at 2024-05-01 17:50:43 +0000