[uboot-tools] add updated patches
Dennis Gilmore
ausil at fedoraproject.org
Fri Oct 18 13:27:51 UTC 2013
commit cd340d22987eca9f40507d887ef29d3c9f29ab71
Author: Dennis Gilmore <dennis at ausil.us>
Date: Fri Oct 18 07:30:13 2013 -0500
add updated patches
...istro-default-commands-and-config-options.patch | 70 ++++++++++++++++++
...d-option-to-include-generic-distro-config.patch | 28 ++++++++
...-boards-to-use-the-generic-distro-support.patch | 41 +++++++++++
...rd-to-use-generic-commands-and-set-needed.patch | 38 ++++++++++
0005-set-the-default-wandboard-boot-commands.patch | 48 +++++++++++++
...set-omap4-to-use-extlinux.conf-by-default.patch | 63 +++++++++++++++++
...emove-CONFIG_MENU_SHOW-from-distro-config.patch | 24 ++++++
...FIT-image-support-since-it-fails-to-build.patch | 24 ++++++
0009-add-defualt-DHCP-config-options.patch | 30 ++++++++
...from-distro-default-not-all-systems-suppo.patch | 32 +++++++++
...eagleboard-to-used-generic-distro-configs.patch | 57 +++++++++++++++
0012-setup-beagleboard-to-load-extlinux.conf.patch | 47 ++++++++++++
...up-distro-common-variables-on-beaglebones.patch | 74 ++++++++++++++++++++
0014-Use-SPDX-header-in-distro-config.patch | 27 +++++++
...djust-addrs-to-work-with-calculated-value.patch | 47 ++++++++++++
15 files changed, 650 insertions(+), 0 deletions(-)
---
diff --git a/0001-add-distro-default-commands-and-config-options.patch b/0001-add-distro-default-commands-and-config-options.patch
new file mode 100644
index 0000000..b5acf13
--- /dev/null
+++ b/0001-add-distro-default-commands-and-config-options.patch
@@ -0,0 +1,70 @@
+From 9172c5926e6875a59a8d1cc82d30b2118ab7308b Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Wed, 7 Aug 2013 23:00:42 -0500
+Subject: [PATCH 01/15] add distro default commands and config options
+
+---
+ include/config_distro_default.h | 51 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+ create mode 100644 include/config_distro_default.h
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+new file mode 100644
+index 0000000..b892868
+--- /dev/null
++++ b/include/config_distro_default.h
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2013 Red Hat, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License Version 2. This file is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#ifndef _CONFIG_CMD_DISTRO_DEFAULT_H
++#define _CONFIG_CMD_DISTRO_DEFAULT_H
++
++/*
++ * List of all commands and options that when defined enables support for features
++ * required by distros to support boards in a standardised and consitant manner.
++ */
++
++
++#define CONFIG_BOOTP_PXE
++
++#if defined(__arm__)
++#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
++#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7"
++#endif
++
++#define CONFIG_OF_LIBFDT
++
++#define CONFIG_CMD_BOOTZ
++#define CONFIG_CMD_DHCP
++#define CONFIG_CMD_ELF
++#define CONFIG_CMD_EXT2
++#define CONFIG_CMD_FAT
++#define CONFIG_CMD_MII
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_PXE
++#define CONFIG_CMD_USB
++
++#define CONFIG_CMDLINE_EDITING
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_BOOTDELAY 2
++#define CONFIG_SYS_LONGHELP
++#define CONFIG_FIT
++#define CONFIG_MENU
++#define CONFIG_MENU_SHOW
++#define CONFIG_DOS_PARTITION
++#define CONFIG_EFI_PARTITION
++#define CONFIG_SUPPORT_RAW_INITRD
++#define CONFIG_SYS_HUSH_PARSER
++#define CONFIG_USB_STORAGE
++
++#endif /* _CONFIG_CMD_DISTRO_DEFAULT_H */
+--
+1.8.3.1
+
diff --git a/0002-add-option-to-include-generic-distro-config.patch b/0002-add-option-to-include-generic-distro-config.patch
new file mode 100644
index 0000000..efaa40b
--- /dev/null
+++ b/0002-add-option-to-include-generic-distro-config.patch
@@ -0,0 +1,28 @@
+From 3c3c10fad1f61f8ad01414c868080e0e1bb5fc91 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Sun, 1 Sep 2013 21:42:48 -0500
+Subject: [PATCH 02/15] add option to include generic distro config
+
+---
+ include/common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/common.h b/include/common.h
+index 409515f..b97a52d 100644
+--- a/include/common.h
++++ b/include/common.h
+@@ -99,6 +99,11 @@ typedef volatile unsigned char vu_char;
+ #include <flash.h>
+ #include <image.h>
+
++/* use generic distro config */
++#ifdef DISTRO_DEFAULTS
++#include <config_distro_default.h>
++#endif
++
+ #ifdef DEBUG
+ #define _DEBUG 1
+ #else
+--
+1.8.3.1
+
diff --git a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
new file mode 100644
index 0000000..5d69e51
--- /dev/null
+++ b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
@@ -0,0 +1,41 @@
+From f12653a82d5417114fb422ae3e3883b96ec31ea5 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 11:26:39 -0500
+Subject: [PATCH 03/15] set omap4 boards to use the generic distro support
+
+---
+ include/configs/omap4_common.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
+index e9f2383..634668a 100644
+--- a/include/configs/omap4_common.h
++++ b/include/configs/omap4_common.h
+@@ -106,6 +106,9 @@
+ /* commands to include */
+ #include <config_cmd_default.h>
+
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ /* Enabled commands */
+ #define CONFIG_CMD_EXT2 /* EXT2 Support */
+ #define CONFIG_CMD_FAT /* FAT support */
+@@ -132,9 +135,13 @@
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x82000000\0" \
++ "pxefile_addr_r=0x82000000\0" \
++ "kernel_addr_r=0x84000000\0" \
++ "ramdisk_addr_r=0x90000000\0" \
++ "fdt_addr_r=0x83000000\0" \
+ "console=ttyO2,115200n8\0" \
+ "fdt_high=0xffffffff\0" \
+- "fdtaddr=0x80f80000\0" \
++ "fdt_addr=0x80f80000\0" \
+ "fdtfile=undefined\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+--
+1.8.3.1
+
diff --git a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
new file mode 100644
index 0000000..7a2b945
--- /dev/null
+++ b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
@@ -0,0 +1,38 @@
+From 4fe19544ffda98c8ab9eea55d29f8c9179716e88 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 11:33:46 -0500
+Subject: [PATCH 04/15] set wandboard to use generic commands and set needed
+ variables
+
+---
+ include/configs/wandboard.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 442a984..423d94e 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -40,6 +40,9 @@
+ #define CONFIG_CONS_INDEX 1
+ #define CONFIG_BAUDRATE 115200
+
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ /* Command definition */
+ #include <config_cmd_default.h>
+
+@@ -114,6 +117,10 @@
+ "initrd_high=0xffffffff\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ "fdt_addr=0x11000000\0" \
++ "pxefile_addr_r=0x13000000\0" \
++ "kernel_addr_r=0x14000000\0" \
++ "ramdisk_addr_r=0x32000000\0" \
++ "fdt_addr_r=0x12000000\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
+ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+--
+1.8.3.1
+
diff --git a/0005-set-the-default-wandboard-boot-commands.patch b/0005-set-the-default-wandboard-boot-commands.patch
new file mode 100644
index 0000000..09b7fc3
--- /dev/null
+++ b/0005-set-the-default-wandboard-boot-commands.patch
@@ -0,0 +1,48 @@
+From e213040f9253ebf299a1dd491443419e9d37d7b8 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 11:44:40 -0500
+Subject: [PATCH 05/15] set the default wandboard boot commands
+
+---
+ include/configs/wandboard.h | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 423d94e..ae16694 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -122,6 +122,23 @@
+ "ramdisk_addr_r=0x32000000\0" \
+ "fdt_addr_r=0x12000000\0" \
+ "boot_fdt=try\0" \
++ "bootcmd_setup=mmc rescan\0" \
++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++ "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
++ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++ "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
++ "localcmd=run bootcmd_mmc\0" \
++ "bootdevice=0\0" \
++ "bootargs=console=ttymxc0 root=LABEL=rootfs\0" \
++ "bootdelay=2\0" \
++ "bootretry=90\0" \
++ "netretry=once\0" \
+ "ip_dyn=yes\0" \
+ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ "mmcpart=1\0" \
+@@ -190,6 +207,7 @@
+
+ #define CONFIG_BOOTCOMMAND \
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
++ "run bootcmd_default; " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
+--
+1.8.3.1
+
diff --git a/0006-set-omap4-to-use-extlinux.conf-by-default.patch b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
new file mode 100644
index 0000000..a46548d
--- /dev/null
+++ b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
@@ -0,0 +1,63 @@
+From 534d6c5a71f1b853d83b0e07ea9c1f272884998b Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 12:35:16 -0500
+Subject: [PATCH 06/15] set omap4 to use extlinux.conf by default
+
+---
+ include/configs/omap4_common.h | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
+index 634668a..7e22321 100644
+--- a/include/configs/omap4_common.h
++++ b/include/configs/omap4_common.h
+@@ -155,6 +155,22 @@
+ "vram=${vram} " \
+ "root=${mmcroot} " \
+ "rootfstype=${mmcrootfstype}\0" \
++ "bootcmd_setup=mmc rescan\0" \
++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++ "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++ "bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++ "localcmd=run bootcmd_mmc\0" \
++ "bootdevice=0\0" \
++ "bootargs=console=${console} root=LABEL=rootfs\0" \
++ "bootdelay=2\0" \
++ "bootretry=90\0" \
++ "netretry=once\0" \
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0" \
+@@ -164,7 +180,7 @@
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+ "mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ "run mmcargs; " \
+- "bootz ${loadaddr} - ${fdtaddr}\0" \
++ "bootz ${loadaddr} - ${fdt_addr}\0" \
+ "findfdt="\
+ "if test $board_name = sdp4430; then " \
+ "setenv fdtfile omap4-sdp.dtb; fi; " \
+@@ -176,12 +192,13 @@
+ "setenv fdtfile omap4-panda-es.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" \
++ "loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+
+ #define CONFIG_BOOTCOMMAND \
+ "run findfdt; " \
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
++ "run bootcmd_default; " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
+--
+1.8.3.1
+
diff --git a/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
new file mode 100644
index 0000000..4306ce9
--- /dev/null
+++ b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
@@ -0,0 +1,24 @@
+From d1b689f0beec17c0531189fb15b076082f0f282e Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 17:54:26 -0500
+Subject: [PATCH 07/15] remove CONFIG_MENU_SHOW from distro config
+
+---
+ include/config_distro_default.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index b892868..aa7500e 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -41,7 +41,6 @@
+ #define CONFIG_SYS_LONGHELP
+ #define CONFIG_FIT
+ #define CONFIG_MENU
+-#define CONFIG_MENU_SHOW
+ #define CONFIG_DOS_PARTITION
+ #define CONFIG_EFI_PARTITION
+ #define CONFIG_SUPPORT_RAW_INITRD
+--
+1.8.3.1
+
diff --git a/0008-disable-FIT-image-support-since-it-fails-to-build.patch b/0008-disable-FIT-image-support-since-it-fails-to-build.patch
new file mode 100644
index 0000000..c0d0a27
--- /dev/null
+++ b/0008-disable-FIT-image-support-since-it-fails-to-build.patch
@@ -0,0 +1,24 @@
+From 2394d596e963d5532f3ff00e097ebcf5c8338610 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 17:55:53 -0500
+Subject: [PATCH 08/15] disable FIT image support since it fails to build
+
+---
+ include/config_distro_default.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index aa7500e..56a5557 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -39,7 +39,6 @@
+ #define CONFIG_AUTO_COMPLETE
+ #define CONFIG_BOOTDELAY 2
+ #define CONFIG_SYS_LONGHELP
+-#define CONFIG_FIT
+ #define CONFIG_MENU
+ #define CONFIG_DOS_PARTITION
+ #define CONFIG_EFI_PARTITION
+--
+1.8.3.1
+
diff --git a/0009-add-defualt-DHCP-config-options.patch b/0009-add-defualt-DHCP-config-options.patch
new file mode 100644
index 0000000..d2e402d
--- /dev/null
+++ b/0009-add-defualt-DHCP-config-options.patch
@@ -0,0 +1,30 @@
+From c50183e7caa3a26d90cc41b43fd705a9a6a7afdd Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 18:26:17 -0500
+Subject: [PATCH 09/15] add defualt DHCP config options
+
+---
+ include/config_distro_default.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 56a5557..7f4c310 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -14,8 +14,12 @@
+ * required by distros to support boards in a standardised and consitant manner.
+ */
+
+-
++#define CONFIG_BOOTP_BOOTPATH
++#define CONFIG_BOOTP_DNS
++#define CONFIG_BOOTP_GATEWAY
++#define CONFIG_BOOTP_HOSTNAME
+ #define CONFIG_BOOTP_PXE
++#define CONFIG_BOOTP_SUBNETMASK
+
+ #if defined(__arm__)
+ #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
+--
+1.8.3.1
+
diff --git a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
new file mode 100644
index 0000000..f11a54d
--- /dev/null
+++ b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
@@ -0,0 +1,32 @@
+From a86c59b6fa841a1c59ecd6849367021c7283b49b Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 18:26:55 -0500
+Subject: [PATCH 10/15] remove USB from distro default, not all systems support
+ USB
+
+---
+ include/config_distro_default.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 7f4c310..132da4f 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -37,7 +37,6 @@
+ #define CONFIG_CMD_NET
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_PXE
+-#define CONFIG_CMD_USB
+
+ #define CONFIG_CMDLINE_EDITING
+ #define CONFIG_AUTO_COMPLETE
+@@ -48,6 +47,5 @@
+ #define CONFIG_EFI_PARTITION
+ #define CONFIG_SUPPORT_RAW_INITRD
+ #define CONFIG_SYS_HUSH_PARSER
+-#define CONFIG_USB_STORAGE
+
+ #endif /* _CONFIG_CMD_DISTRO_DEFAULT_H */
+--
+1.8.3.1
+
diff --git a/0011-Setup-beagleboard-to-used-generic-distro-configs.patch b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
new file mode 100644
index 0000000..173efd9
--- /dev/null
+++ b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
@@ -0,0 +1,57 @@
+From 0893da22f56bda219e6437057a1145932a8311ac Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 21:47:40 -0500
+Subject: [PATCH 11/15] Setup beagleboard to used generic distro configs
+
+---
+ include/configs/omap3_beagle.h | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 9fcd50b..2dbb5d9 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -130,6 +130,9 @@
+ /* commands to include */
+ #include <config_cmd_default.h>
+
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ #define CONFIG_CMD_ASKENV
+
+ #define CONFIG_CMD_CACHE
+@@ -194,9 +197,13 @@
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x80200000\0" \
++ "pxefile_addr_r=0x82000000\0" \
++ "kernel_addr_r=0x84000000\0" \
++ "ramdisk_addr_r=0x90000000\0" \
++ "fdt_addr_r=0x83000000\0" \
+ "rdaddr=0x81000000\0" \
+ "fdt_high=0xffffffff\0" \
+- "fdtaddr=0x80f80000\0" \
++ "fdt_addr=0x80f80000\0" \
+ "usbtty=cdc_acm\0" \
+ "bootfile=uImage\0" \
+ "ramdisk=ramdisk.gz\0" \
+@@ -263,13 +270,13 @@
+ "rootfstype=${ramrootfstype}\0" \
+ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++ "loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+ "mmcboot=echo Booting from mmc ...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr}\0" \
+ "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
+ "run mmcargs; " \
+- "bootz ${loadaddr} - ${fdtaddr}\0" \
++ "bootz ${loadaddr} - ${fdt_addr}\0" \
+ "nandboot=echo Booting from nand ...; " \
+ "run nandargs; " \
+ "nand read ${loadaddr} 280000 400000; " \
+--
+1.8.3.1
+
diff --git a/0012-setup-beagleboard-to-load-extlinux.conf.patch b/0012-setup-beagleboard-to-load-extlinux.conf.patch
new file mode 100644
index 0000000..edf8a49
--- /dev/null
+++ b/0012-setup-beagleboard-to-load-extlinux.conf.patch
@@ -0,0 +1,47 @@
+From b76a0828e3c62e74f59eda1d128dc9518c44f4ab Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 2 Sep 2013 21:55:37 -0500
+Subject: [PATCH 12/15] setup beagleboard to load extlinux.conf
+
+---
+ include/configs/omap3_beagle.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 2dbb5d9..f97c244 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -255,6 +255,22 @@
+ "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+ "if test $fdtfile = undefined; then " \
+ "echo WARNING: Could not determine device tree to use; fi; \0" \
++ "bootcmd_setup=mmc rescan\0" \
++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++ "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++ "bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++ "localcmd=run bootcmd_mmc\0" \
++ "bootdevice=0\0" \
++ "bootargs=console=${console} root=LABEL=rootfs\0" \
++ "bootdelay=2\0" \
++ "bootretry=90\0" \
++ "netretry=once\0" \
+ "bootenv=uEnv.txt\0" \
+ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+ "importbootenv=echo Importing environment from mmc ...; " \
+@@ -292,6 +308,7 @@
+ #define CONFIG_BOOTCOMMAND \
+ "run findfdt; " \
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
++ "run bootcmd_default; " \
+ "if run userbutton; then " \
+ "setenv bootenv uEnv.txt;" \
+ "else " \
+--
+1.8.3.1
+
diff --git a/0013-setup-distro-common-variables-on-beaglebones.patch b/0013-setup-distro-common-variables-on-beaglebones.patch
new file mode 100644
index 0000000..d2cf91a
--- /dev/null
+++ b/0013-setup-distro-common-variables-on-beaglebones.patch
@@ -0,0 +1,74 @@
+From c1ce44384122a284dad8efb084fe6f1c047633ea Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 18:21:54 -0500
+Subject: [PATCH 13/15] setup distro common variables on beaglebones
+
+---
+ include/configs/am335x_evm.h | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index c2ba7e3..25f5893 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -57,10 +57,13 @@
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x80200000\0" \
+- "fdtaddr=0x80F80000\0" \
++ "pxefile_addr_r=0x80500000\0" \
++ "kernel_addr_r=0x80600000\0" \
++ "ramdisk_addr_r=0x82600000\0" \
++ "fdt_addr_r=0x80300000\0" \
++ "fdt_addr=0x80400000\0" \
+ "fdt_high=0xffffffff\0" \
+ "boot_fdt=try\0" \
+- "rdaddr=0x81000000\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+ "bootfile=zImage\0" \
+@@ -76,7 +79,7 @@
+ "nfsopts=nolock\0" \
+ "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
+ "::off\0" \
+- "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
++ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${ramdisk_addr_r},64M\0" \
+ "ramrootfstype=ext2\0" \
+ "mmcargs=setenv bootargs console=${console} " \
+ "${optargs} " \
+@@ -105,13 +108,13 @@
+ "${optargs} " \
+ "root=${ramroot} " \
+ "rootfstype=${ramrootfstype}\0" \
+- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
++ "loadramdisk=load mmc ${mmcdev} ${ramdisk_addr_r} ramdisk.gz\0" \
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++ "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \
+ "mmcloados=run mmcargs; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ "if run loadfdt; then " \
+- "bootz ${loadaddr} - ${fdtaddr}; " \
++ "bootz ${loadaddr} - ${fdt_addr_r}; " \
+ "else " \
+ "if test ${boot_fdt} = try; then " \
+ "bootz; " \
+@@ -146,12 +149,12 @@
+ "setenv autoload no; " \
+ "dhcp; " \
+ "tftp ${loadaddr} ${bootfile}; " \
+- "tftp ${fdtaddr} ${fdtfile}; " \
++ "tftp ${fdt_addr_r} ${fdtfile}; " \
+ "run netargs; " \
+- "bootz ${loadaddr} - ${fdtaddr}\0" \
++ "bootz ${loadaddr} - ${fdt_addr_r}\0" \
+ "ramboot=echo Booting from ramdisk ...; " \
+ "run ramargs; " \
+- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
++ "bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
+ "findfdt="\
+ "if test $board_name = A335BONE; then " \
+ "setenv fdtfile am335x-bone.dtb; fi; " \
+--
+1.8.3.1
+
diff --git a/0014-Use-SPDX-header-in-distro-config.patch b/0014-Use-SPDX-header-in-distro-config.patch
new file mode 100644
index 0000000..47acd47
--- /dev/null
+++ b/0014-Use-SPDX-header-in-distro-config.patch
@@ -0,0 +1,27 @@
+From f5c7ad35415218c20b904edf1981a33a47bcdf92 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 18:55:25 -0500
+Subject: [PATCH 14/15] Use SPDX header in distro config
+
+---
+ include/config_distro_default.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 132da4f..bd9b4a0 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -1,9 +1,7 @@
+ /*
+ * Copyright 2013 Red Hat, Inc.
+ *
+- * This file is licensed under the terms of the GNU General Public
+- * License Version 2. This file is licensed "as is" without any
+- * warranty of any kind, whether express or implied.
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+ #ifndef _CONFIG_CMD_DISTRO_DEFAULT_H
+--
+1.8.3.1
+
diff --git a/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
new file mode 100644
index 0000000..543b0d6
--- /dev/null
+++ b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
@@ -0,0 +1,47 @@
+From db994bffd3db0a6d02fa049eca0ff83720e22e73 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 17 Oct 2013 19:12:52 -0500
+Subject: [PATCH 15/15] WANDBOARD: adjust addrs to work with calculated values.
+ add scr_addr_r so the fall back to boot.scr has somewhere to be loaded have
+ pxe boot load a fdt have sysboot load a fdt
+
+---
+ include/configs/wandboard.h | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index ae16694..135835f 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -116,20 +116,21 @@
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+- "fdt_addr=0x11000000\0" \
+- "pxefile_addr_r=0x13000000\0" \
+- "kernel_addr_r=0x14000000\0" \
+- "ramdisk_addr_r=0x32000000\0" \
+- "fdt_addr_r=0x12000000\0" \
++ "fdt_addr=0x11100000\0" \
++ "fdt_addr_r=0x11200000\0" \
++ "pxefile_addr_r=0x11300000\0" \
++ "scr_addr_r=0x11400000\0" \
++ "kernel_addr_r=0x11500000\0" \
++ "ramdisk_addr_r=0x13500000\0" \
+ "boot_fdt=try\0" \
+ "bootcmd_setup=mmc rescan\0" \
+- "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; tftp ${fdt_addr} /dtb/${fdt_file}; pxe get; pxe boot\0" \
+ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
+ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
+ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
+- "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++ "bootcmd_disk=load ${boot_ifc} ${bootdevice} ${fdt_addr} /boot/dtb/${fdt_file}; load ${boot_ifc} ${bootdevice} ${fdt_addr} /dtb/${fdt_file};run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
+ "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
+ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
+ "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
+--
+1.8.3.1
+
More information about the scm-commits
mailing list