diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-10-29 14:38:39 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-10-29 14:38:39 -0500 |
commit | c33101df40ad24185c41503469d3fbead4f54a9a (patch) | |
tree | db54a99f707ad411945834239a1b82e7672d93b3 | |
parent | 1efd4f68c5096f2a4b8b8168e803293083b0f8cd (diff) | |
parent | 8d34751349709ba9392ae84f3d559576d31cb642 (diff) | |
download | talos-openbmc-c33101df40ad24185c41503469d3fbead4f54a9a.tar.gz talos-openbmc-c33101df40ad24185c41503469d3fbead4f54a9a.zip |
Merge pull request #47 from bradbishop/barreleye
uboot updates
4 files changed, 19 insertions, 1 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch index 1c1c5ea5f..f34ef2201 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/patch-2013.07/0001-u-boot-openbmc.patch @@ -1679,7 +1679,7 @@ index 0000000..6bb7639 +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 -+#define CONFIG_BOOTARGS "debug console=ttyS4,38400n8 root=/dev/ram rw" ++#define CONFIG_BOOTARGS "console=ttyS4,38400n8 root=/dev/ram rw" +#define CONFIG_UPDATE "tftp 40800000 ast2400.scr; so 40800000'" + +#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch new file mode 100644 index 000000000..dab24f6ce --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch @@ -0,0 +1,13 @@ +Index: git/drivers/net/aspeednic.c +=================================================================== +--- git.orig/drivers/net/aspeednic.c 2015-10-29 13:23:42.225712001 -0500 ++++ git/drivers/net/aspeednic.c 2015-10-29 13:26:52.205712001 -0500 +@@ -1155,7 +1155,7 @@ + + RESET_DE4X5(dev); + +- aspeednic_probe_phy(dev); ++ //aspeednic_probe_phy(dev); + + set_mac_address (dev, bis); + set_mac_control_register (dev); diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend new file mode 100644 index 000000000..1eeec2e5e --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/u-boot_2013.07%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_append := "${THISDIR}/files:" + +SRC_URI += "file://u-boot-barreleye.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt new file mode 100644 index 000000000..4bfc83687 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes.txt @@ -0,0 +1,2 @@ +recipes-bsp - Anything with links to specific hardware or hardware configuration information +recipes-phosphor - Phosphor OpenBMC applications and configuration |