diff options
Diffstat (limited to 'main/u-boot/distroconfig-wandboard.patch')
| -rw-r--r-- | main/u-boot/distroconfig-wandboard.patch | 169 |
1 files changed, 0 insertions, 169 deletions
diff --git a/main/u-boot/distroconfig-wandboard.patch b/main/u-boot/distroconfig-wandboard.patch deleted file mode 100644 index 94529acb9c..0000000000 --- a/main/u-boot/distroconfig-wandboard.patch +++ /dev/null @@ -1,169 +0,0 @@ -From d5e9f0b3d2495bcf81647887c8aaadf02223d108 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Fri, 6 Mar 2015 10:33:25 +0000 -Subject: [PATCH 06/14] wandboard: port to generic distro booting - -set the variables and functions needed for generic distro booting. ---- - include/configs/wandboard.h | 48 ++++++++++++++++++++++++--------------------- - 1 file changed, 26 insertions(+), 22 deletions(-) - -diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index 117d1f7..1d8459c 100644 ---- a/include/configs/wandboard.h -+++ b/include/configs/wandboard.h -@@ -51,8 +51,6 @@ - #define CONFIG_CMD_BMODE - #define CONFIG_CMD_SETEXPR - --#define CONFIG_BOOTDELAY 5 -- - #define CONFIG_SYS_MEMTEST_START 0x10000000 - #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) - #define CONFIG_LOADADDR 0x12000000 -@@ -74,9 +72,6 @@ - #define CONFIG_CMD_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_BOUNCE_BUFFER --#define CONFIG_CMD_EXT2 --#define CONFIG_CMD_FAT --#define CONFIG_DOS_PARTITION - - /* USB Configs */ - #define CONFIG_CMD_USB -@@ -88,10 +83,6 @@ - #define CONFIG_MXC_USB_FLAGS 0 - - /* Ethernet Configuration */ --#define CONFIG_CMD_PING --#define CONFIG_CMD_DHCP --#define CONFIG_CMD_MII --#define CONFIG_CMD_NET - #define CONFIG_FEC_MXC - #define CONFIG_MII - #define IMX_FEC_BASE ENET_BASE_ADDR -@@ -124,6 +115,16 @@ - #define CONFIG_MXC_OCOTP - #endif - -+#ifndef CONFIG_SPL_BUILD -+#include <config_distro_defaults.h> -+#include <config_distro_bootcmd.h> -+ -+#define BOOT_TARGET_DEVICES(func) \ -+ func(MMC, mmc, 0) \ -+ func(PXE, pxe, na) \ -+ func(DHCP, dhcp, na) -+ -+ - #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) - #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" - #elif defined(CONFIG_MX6Q) -@@ -133,13 +134,16 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ -- "console=ttymxc0\0" \ -+ "console=ttymxc0,115200\0" \ - "splashpos=m,m\0" \ -- "fdt_high=0xffffffff\0" \ -- "initrd_high=0xffffffff\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -- "fdt_addr=0x18000000\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdt_addr_r=0x18000000\0" \ - "boot_fdt=try\0" \ -+ "pxefile_addr_r=0x17f00000\0" \ -+ "scriptaddr=0x17e00000\0" \ -+ "kernel_addr_r=0x11000000\0" \ -+ "ramdisk_addr_r=0x18100000\0" \ -+ "bootm_size=0x20000000\0" \ - "ip_dyn=yes\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ -@@ -158,7 +162,7 @@ - "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "fi; " \ - "fi\0" \ -- "mmcargs=setenv bootargs console=${console},${baudrate} " \ -+ "mmcargs=setenv bootargs console=${console} " \ - "root=${mmcroot}; run videoargs\0" \ - "videoargs=" \ - "setenv nextcon 0; " \ -@@ -207,7 +211,7 @@ - "else " \ - "bootz; " \ - "fi;\0" \ -- "netargs=setenv bootargs console=${console},${baudrate} " \ -+ "netargs=setenv bootargs console=${console} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ -@@ -230,7 +234,8 @@ - "fi; " \ - "else " \ - "bootz; " \ -- "fi;\0" -+ "fi;\0" \ -+ BOOTENV - - #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ -@@ -244,6 +249,10 @@ - "fi; " \ - "else run netboot; fi" - -+#else -+#define BOOT_TARGET_DEVICES -+#endif -+ - /* Miscellaneous configurable options */ - #define CONFIG_SYS_LONGHELP - #define CONFIG_SYS_HUSH_PARSER -@@ -257,8 +266,6 @@ - - #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - --#define CONFIG_CMDLINE_EDITING -- - /* Physical Memory Map */ - #define CONFIG_NR_DRAM_BANKS 1 - #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR -@@ -281,9 +288,6 @@ - #define CONFIG_ENV_OFFSET (6 * 64 * 1024) - #define CONFIG_SYS_MMC_ENV_DEV 0 - --#define CONFIG_OF_LIBFDT --#define CONFIG_CMD_BOOTZ -- - #ifndef CONFIG_SYS_DCACHE_OFF - #define CONFIG_CMD_CACHE - #endif --- -2.3.2 - -From c1b63c708f15f8840307507b649c36abb529c08f Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore <dennis@ausil.us> -Date: Sat, 21 Mar 2015 12:17:08 -0500 -Subject: [PATCH 13/14] WANDBOARD: run the dsitro bootcmd first before falling - back to old settings - ---- - include/configs/wandboard.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index 1d8459c..07c3d63 100644 ---- a/include/configs/wandboard.h -+++ b/include/configs/wandboard.h -@@ -238,6 +238,7 @@ - BOOTENV - - #define CONFIG_BOOTCOMMAND \ -+ "run distro_bootcmd;" \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ --- -2.3.2 - |