diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-24 06:32:26 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-11 17:16:24 +0300 |
| commit | 01ddfab322ae50bedaa250630661ebed0c1a9101 (patch) | |
| tree | b87010b45ba17d439101302b559e7edca09b0a6c /meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch | |
| parent | 9c8c98545becdb348a6d72f68071d15d1cacff8e (diff) | |
| download | openbmc-01ddfab322ae50bedaa250630661ebed0c1a9101.tar.xz | |
Use BB collections for Aspeed tree patches
Move the Aspeed u-boot tree patches to a directory where they can
be conditionally applied when the Aspeed layer is in the build
configuration.
This is a better way to achieve 273ec60e436 since it enables the Aspeed
BSP layer to name its u-boot/kernel recipes whatever it wants.
Remove stubbed do_configure from u-boot_%.bbappend. It is no longer
required since the bbappend is only activated when the aspeed layer
and associated u-boot recipes are in the layer configuration.
Tested: Built u-boot recipe for witherspoon and palmetto targets
Change-Id: I52dceb65598e0cf660ad035a8f14e9894325ca71
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch')
| -rw-r--r-- | meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch new file mode 100644 index 000000000..d04156712 --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0002-config-ast-common-hack-bootopts.patch @@ -0,0 +1,28 @@ +From c678bbdad037604850613e775baacc52ed92c9c1 Mon Sep 17 00:00:00 2001 +From: Patrick Williams <patrick@stwcx.xyz> +Date: Fri, 21 Jul 2017 16:30:01 -0500 +Subject: [PATCH 2/4] config/ast-common: hack bootopts + +Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +--- + include/configs/ast-common.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h +index a0243083bd..7ddba62298 100644 +--- a/include/configs/ast-common.h ++++ b/include/configs/ast-common.h +@@ -96,7 +96,10 @@ + #define CONFIG_CMD_MTDPARTS + #endif + ++#if 0 + #define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw" ++#endif ++#define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/mtdblock4 ro" + + #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */ + #define CONFIG_FMC_CS 1 +-- +2.14.3 + |